summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-09-01 19:16:32 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-09-01 19:16:32 +0800
commit8ca60517e589539aa3a7c74c363bc2cf67f4176b (patch)
tree48df25ef22a527e065efad08b0f2911e0e4c6903
parentc2596b0331dd25046d12b3ef826f33a97027d870 (diff)
downloadxorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar.gz
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar.bz2
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar.lz
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar.xz
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.tar.zst
xorg-devel-ports-8ca60517e589539aa3a7c74c363bc2cf67f4176b.zip
Don't enable RADEON on sparc64.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1119 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--graphics/libdrm/Makefile6
-rw-r--r--graphics/libdrm/pkg-plist12
2 files changed, 9 insertions, 9 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 8a83621..9e5326f 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -33,10 +33,10 @@ USES+= gmake
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-libkms
EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c
-PLIST_SUB+= KMS=""
+PLIST_SUB+= KMS="" NOUVEAU=""
.else
CONFIGURE_ARGS+=--disable-libkms
-PLIST_SUB+= KMS="@comment "
+PLIST_SUB+= KMS="@comment " NOUVEAU="@comment "
.endif
.if ${PORT_OPTIONS:MMANPAGES}
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=--disable-vmwgfx
CONFIGURE_ARGS= --enable-nouveau-experimental-api
LIBDRM_VERSION= 2.4.17
LIBDRM_REVISION=1
-PLIST_SUB+= OLD="" NEW="@comment "
+PLIST_SUB+= OLD="" NEW="@comment " NOUVEAU=""
.endif
.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc"
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index acfe65d..52b7363 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -22,7 +22,7 @@
%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
%%NEW%%include/libdrm/mach64_drm.h
%%NEW%%include/libdrm/mga_drm.h
-%%NEW%%include/libdrm/nouveau.h
+%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h
%%NEW%%include/libdrm/nouveau_drm.h
%%NEW%%include/libdrm/qxl_drm.h
%%NEW%%include/libdrm/r128_drm.h
@@ -55,10 +55,10 @@ lib/libdrm.so.2
%%INTEL_DRIVER%%lib/libdrm_intel.la
%%INTEL_DRIVER%%lib/libdrm_intel.so
%%INTEL_DRIVER%%lib/libdrm_intel.so.1
-lib/libdrm_nouveau.la
-lib/libdrm_nouveau.so
-%%OLD%%lib/libdrm_nouveau.so.1
-%%NEW%%lib/libdrm_nouveau.so.2
+%%NOUVEAU%%lib/libdrm_nouveau.la
+%%NOUVEAU%%lib/libdrm_nouveau.so
+%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1
+%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
@@ -67,7 +67,7 @@ lib/libdrm_nouveau.so
%%NEW%%%%KMS%%lib/libkms.so.1
libdata/pkgconfig/libdrm.pc
%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
+%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
%%OLD%%@dirrm include/nouveau