rpms/mesa/devel mesa-7.1-dri-drivers.patch, 1.1, 1.2 mesa.spec, 1.164, 1.165

[Adam Jackson (ajax)]

Author: ajax

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

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


mesa-7.1-dri-drivers.patch:

Index: mesa-7.1-dri-drivers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-dri-drivers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.1-dri-drivers.patch	21 Feb 2008 01:57:07 -0000	1.1
+++ mesa-7.1-dri-drivers.patch	21 Feb 2008 02:31:49 -0000	1.2
@@ -1,6 +1,15 @@
 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
++++ mesa-20080218/configure.ac	2008-02-20 21:30:47.000000000 -0500
+@@ -475,7 +475,7 @@ if test "$mesa_driver" = dri; then
+         fi
+ 
+         case "$host_cpu" in
+-        x86_64)
++        x86_64*)
+             # ffb, gamma, and sis are missing because they have not be
+             # converted to use the new interface.  i810 are missing
+             # because there is no x86-64 system where they could *ever*
 @@ -484,6 +484,7 @@ if test "$mesa_driver" = dri; then
                  DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
                      savage tdfx unichrome"


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- mesa.spec	21 Feb 2008 01:57:07 -0000	1.164
+++ mesa.spec	21 Feb 2008 02:31:49 -0000	1.165
@@ -195,7 +195,7 @@
     --with-dri-driverdir=%{_libdir}/dri
 
 echo "--- MESA CONFIGURATION ---"
-cat configs/default
+cat configs/current
 echo "--- END MESA CONFIGURATION ---"
 
 make %{?_smp_mflags}
@@ -218,7 +218,7 @@
 %if %{with_dri}
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis tdfx unichrome; do
-    so=lib/${f}_dri.so
+    so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
 done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
 %endif
@@ -399,7 +399,7 @@
 
 %changelog
 * Wed Feb 20 2008 Adam Jackson <ajax at redhat.com> 7.1-0.16
-- Fix build on powerpc.
+- Fix build on powerpc and amd64.
 
 * Mon Feb 18 2008 Adam Jackson <ajax at redhat.com> 7.1-0.15
 - Today's git snapshot, additional headers for DRI2 love.