diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
| commit | 92ea0d614b10bd99ce43a611721c7c4003cd79a5 (patch) | |
| tree | cf13f962932aab3646f0af684b2923c4e0f0825b /graphics/libGL/files/extra-configure | |
| parent | - Unbreak build when devel/libsysinfo is installed (diff) | |
The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production:
Xorg 7.7
Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities
Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.
PR: ports/177942
Exp-run by: miwi
Approved by: portmgr (miwi)
Thanks to all who helped testing!
Notes
Notes:
svn path=/head/; revision=319055
Diffstat (limited to 'graphics/libGL/files/extra-configure')
| -rw-r--r-- | graphics/libGL/files/extra-configure | 24 |
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" |