aboutsummaryrefslogtreecommitdiff
path: root/graphics/libGL/files/extra-configure
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/libGL/files/extra-configure')
-rw-r--r--graphics/libGL/files/extra-configure24
1 files changed, 11 insertions, 13 deletions
diff --git a/graphics/libGL/files/extra-configure b/graphics/libGL/files/extra-configure
index fc1a68f41695..d1ae3b75e23d 100644
--- a/graphics/libGL/files/extra-configure
+++ b/graphics/libGL/files/extra-configure
@@ -1,42 +1,40 @@
---- configure.orig 2011-11-17 19:46:34.000000000 +0000
-+++ configure 2012-06-28 12:53:09.000000000 +0000
-@@ -7817,10 +7817,35 @@
- DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
- fi
+--- configure.orig 2012-07-10 17:30:46.000000000 +0200
++++ configure 2012-09-01 13:27:22.000000000 +0200
+@@ -9017,9 +9017,34 @@
+ DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+ DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
- if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
-- radeon tdfx unichrome savage sis swrast"
+- DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
- fi
+ case "$host_cpu" in
+ x86_64)
+ # i810 is missing because there is no x86-64 system where it
+ # could *ever* be used.
+ if test "x$DRI_DIRS" = "xyes"; then
-+ DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
-+ radeon savage tdfx unichrome sis swrast"
++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
+ fi
+ ;;
+ i*86)
+ if test "x$DRI_DIRS" = "xyes"; then
-+ DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \
-+ r600 radeon savage tdfx unichrome sis swrast"
++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
+ fi
+ ;;
+ powerpc*)
+ # Build only the drivers for cards that exist on PowerPC.
+ # At some point MGA will be added, but not yet.
+ if test "x$DRI_DIRS" = "xyes"; then
-+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
++ DRI_DIRS="r200 radeon swrast"
+ fi
+ ;;
+ sparc*)
+ # Build only the drivers for cards that exist on SPARC.
+ if test "x$DRI_DIRS" = "xyes"; then
-+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
++ DRI_DIRS="r200 radeon swrast"
+ fi
+ ;;
+ esac
++
;;
gnu*)
DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"