From 304ab93299ac131b89bbd2c331c374ecb734224c Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 23 Jan 2017 13:57:06 +0000 Subject: graphics/libdrm: unbreak on armv6 + aarch64 PR: 216377 Submitted by: mikael.urankar@gmail.com Approved by: portmgr blanket --- graphics/libdrm/Makefile | 3 ++- graphics/libdrm/pkg-plist | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'graphics') diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 349ea9aad8d6..aa550204d9e6 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -3,6 +3,7 @@ PORTNAME= libdrm PORTVERSION= 2.4.74 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ @@ -62,7 +63,7 @@ PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" -.elif ${ARCH} == arm6 || ${ARCH} == aarch64 +.elif ${ARCH} == armv6 || ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index f80494f9af70..75a03f49ada6 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,3 +1,5 @@ +%%ARM_DRIVERS%%include/freedreno/freedreno_drmif.h +%%ARM_DRIVERS%%include/freedreno/freedreno_ringbuffer.h %%RADEON_DRIVERS%%include/libdrm/amdgpu.h %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h @@ -35,7 +37,7 @@ include/libdrm/sis_drm.h include/libdrm/tegra_drm.h include/libdrm/vc4_drm.h %%ARM_DRIVERS%%include/libdrm/vc4_packet.h -%%ARM_DRIVERS%%include/libdrm/vc4_gpq_defines.h +%%ARM_DRIVERS%%include/libdrm/vc4_qpu_defines.h include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h %%KMS%%include/libkms/libkms.h @@ -48,6 +50,9 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0 +%%ARM_DRIVERS%%lib/libdrm_freedreno.so +%%ARM_DRIVERS%%lib/libdrm_freedreno.so.1 +%%ARM_DRIVERS%%lib/libdrm_freedreno.so.1.0.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0 @@ -57,14 +62,12 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 -%%ARM_DRIVERS%%lib/libdrm_vc4.so -%%ARM_DRIVERS%%lib/libdrm_vc4.so.1 -%%ARM_DRIVERS%%lib/libdrm_vc4.so.1.0.0 %%KMS%%lib/libkms.so %%KMS%%lib/libkms.so.1 %%KMS%%lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc +%%ARM_DRIVERS%%libdata/pkgconfig/libdrm_freedreno.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%NOUVEAU_DRIVER%%libdata/pkgconfig/libdrm_nouveau.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -- cgit