diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-22 07:43:16 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-22 07:43:16 +0800 |
| commit | 2df27cbe563d2751339350497bf4f35c9b9bb4d0 (patch) | |
| tree | 94960cbb41e3e1ba3c342ccb5b38bf38de5d52e0 | |
| parent | f50e4d179a82686544a7f3c5e048573339239689 (diff) | |
| download | xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar.gz xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar.bz2 xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar.lz xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar.xz xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.tar.zst xorg-devel-ports-2df27cbe563d2751339350497bf4f35c9b9bb4d0.zip | |
Merge r762:
Fix configure after r739
Submitted by: kwm
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@766 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | graphics/dri/Makefile | 17 | ||||
| -rw-r--r-- | graphics/dri/pkg-plist | 20 |
2 files changed, 24 insertions, 13 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index dceddd8..1e3bfd0 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -10,13 +10,16 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \ - expat.6:${PORTSDIR}/textproc/expat2 + expat:${PORTSDIR}/textproc/expat2 USE_PKGCONFIG= build USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto -ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ - SAVAGE SIS SWRAST TDFX UNICHROME +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST + +.if ! defined(WITH_NEW_XORG) +ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME +.endif .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" @@ -27,9 +30,17 @@ BROKEN= does not install on ia64 .if ${ARCH} == "amd64" || ${ARCH} == "i386" OPTIONS_DEFINE= ${ALL_DRI_DRIVERS} .elif ${ARCH} == "powerpc" +. if defined(WITH_NEW_XORG) +OPTIONS_DEFINE= RADEON SWRAST +. else OPTIONS_DEFINE= MACH64 RADEON SWRAST TDFX +. endif .elif ${ARCH} == "sparc64" +. if defined(WITH_NEW_XORG) +OPTIONS_DEIFNE= RADEON SWRAST +. else OPTIONS_DEFINE= MACH64 RADEON SWRAST +. endif .endif OPTIONS_DEFAULT=${OPTIONS_DEFINE} diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 9442cdb..43e5ab1 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,19 +1,19 @@ include/GL/internal/dri_interface.h -%%I810_DRIVER%%lib/dri/i810_dri.so +%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so -%%MACH64_DRIVER%%lib/dri/mach64_dri.so -%%MGA_DRIVER%%lib/dri/mga_dri.so -%%R128_DRIVER%%lib/dri/r128_dri.so +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so %%R200_DRIVER%%lib/dri/r200_dri.so -%%R300_DRIVER%%lib/dri/r300_dri.so -%%R600_DRIVER%%lib/dri/r600_dri.so +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so %%RADEON_DRIVER%%lib/dri/radeon_dri.so -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so -%%SIS_DRIVER%%lib/dri/sis_dri.so +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so %%SWRAST_DRIVER%%lib/dri/swrast_dri.so -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal |