rpms/mesa/devel mesa-7.1-dri-drivers.patch, NONE, 1.1 mesa.spec, 1.163, 1.164

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11784

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.1-dri-drivers.patch 
Log Message:
* Wed Feb 20 2008 Adam Jackson <ajax at redhat.com> 7.1-0.16
- Fix build on powerpc.


mesa-7.1-dri-drivers.patch:

--- NEW FILE mesa-7.1-dri-drivers.patch ---
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
         ;;


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- mesa.spec	18 Feb 2008 16:23:51 -0000	1.163
+++ mesa.spec	21 Feb 2008 01:57:07 -0000	1.164
@@ -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 @@
 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 @@
 %{_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 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Wed Feb 20 2008 Adam Jackson <ajax at redhat.com> 7.1-0.16
+- Fix build on powerpc.
+
 * Mon Feb 18 2008 Adam Jackson <ajax at redhat.com> 7.1-0.15
 - Today's git snapshot, additional headers for DRI2 love.