- Fix build on powerpc.

4 files changed, 27 insertions, 2 deletions

diff --git a/.cvsignore b/.cvsignore
index 1dadfc3..29c1780 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 gl-manpages-1.0.1.tar.bz2
 mesa-20080215.tar.bz2
+mesa-20080218.tar.bz2
diff --git a/mesa-7.1-dri-drivers.patch b/mesa-7.1-dri-drivers.patch
new file mode 100644
index 0000000..706d235
--- /dev/null
+++ b/mesa-7.1-dri-drivers.patch
@@ -0,0 +1,19 @@
+diff -up mesa-20080218/configure.ac.jx mesa-20080218/configure.ac
+--- mesa-20080218/configure.ac.jx	2008-02-18 12:01:51.000000000 -0500
++++ mesa-20080218/configure.ac	2008-02-20 20:54:55.000000000 -0500
+@@ -484,6 +484,7 @@ if test "$mesa_driver" = dri; then
+                 DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
+                     savage tdfx unichrome"
+             fi
++	    DRI_DIRS="`echo $DRI_DIRS | sed 's/i810//g'`"
+             ;;
+         powerpc*)
+             # Build only the drivers for cards that exist on PowerPC.
+@@ -491,6 +492,7 @@ if test "$mesa_driver" = dri; then
+             if test "x$DRI_DIRS" = x; then
+                 DRI_DIRS="mach64 r128 r200 r300 radeon tdfx"
+             fi
++	    DRI_DIRS="`echo $DRI_DIRS | sed 's/i... //g'`"
+             ;;
+         esac
+         ;;
diff --git a/mesa.spec b/mesa.spec
index bde1246..8f6c0f5 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.15%{?dist}
+Release: 0.16%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -28,6 +28,7 @@ Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
 Patch0: mesa-7.1pre-osmesa-version.patch
+Patch1: mesa-7.1-dri-drivers.patch
 
 
 BuildRequires: pkgconfig autoconf automake
@@ -298,6 +299,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/xmesa_xf86.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
+%{_includedir}/GL/internal/dri_sarea.h
 %{_libdir}/libGL.so
 %{_libdir}/pkgconfig/gl.pc
 %{_datadir}/man/man3/gl[^uX]*.3gl*
@@ -396,6 +398,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Wed Feb 20 2008 Adam Jackson <ajax@redhat.com> 7.1-0.16
+- Fix build on powerpc.
+
 * Mon Feb 18 2008 Adam Jackson <ajax@redhat.com> 7.1-0.15
 - Today's git snapshot, additional headers for DRI2 love.
 
diff --git a/sources b/sources
index 5abce71..7a52276 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-fd86d11f88e1cb43057e87629ac36ab1  mesa-20080215.tar.bz2
+0faf6afeee7f2ef78efeb681690c0c25  mesa-20080218.tar.bz2