rpms/mesa/devel mesa-7.1-sis-ia64.patch, NONE, 1.1 mesa.spec, 1.157, 1.158

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.1-sis-ia64.patch 
Log Message:
* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 7.1-0.10
- mesa-7.1-sis-ia64.patch: Fix sis driver on ia64. (#432428)


mesa-7.1-sis-ia64.patch:

--- NEW FILE mesa-7.1-sis-ia64.patch ---
diff -up mesa-20071127/src/mesa/drivers/dri/sis/sis_context.h.broken mesa-20071127/src/mesa/drivers/dri/sis/sis_context.h
--- mesa-20071127/src/mesa/drivers/dri/sis/sis_context.h.broken	2008-02-11 20:22:25.000000000 -0500
+++ mesa-20071127/src/mesa/drivers/dri/sis/sis_context.h	2008-02-11 20:23:38.000000000 -0500
@@ -403,6 +403,8 @@ struct sis_context
 
 #if defined(__i386__) || defined(__amd64__)
 #define MMIO_WMB()	__asm __volatile("" : : : "memory")
+#elif defined (__ia64__)
+#define MMIO_WMB()	__asm __volatile ("mf" : : : "memory")
 #else
 #error platform needs WMB
 #endif


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- mesa.spec	11 Feb 2008 20:50:43 -0000	1.157
+++ mesa.spec	12 Feb 2008 15:40:06 -0000	1.158
@@ -35,7 +35,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -55,6 +55,7 @@
 Patch26: mesa-7.1-remove-getid-i915.patch
 Patch27: mesa-7.1-e7221.patch
 Patch28: mesa-7.1-ia64-build-fix.patch
+Patch29: mesa-7.1-sis-ia64.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -186,6 +187,7 @@
 %patch26 -p1 -b .fixi915
 %patch27 -p1 -b .e7221
 %patch28 -p1 -b .ia64
+%patch29 -p1 -b .sis
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -417,6 +419,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 7.1-0.10
+- mesa-7.1-sis-ia64.patch: Fix sis driver on ia64. (#432428)
+
 * Mon Feb 11 2008 Adam Jackson <ajax at redhat.com> 7.1-0.9
 - mesa-7.1-ia64-build-fix.patch: Fix build on ia64. (#427558)