diff options
author | Adam Jackson <ajax@fedoraproject.org> | 2008-02-12 15:40:06 +0000 |
---|---|---|
committer | Adam Jackson <ajax@fedoraproject.org> | 2008-02-12 15:40:06 +0000 |
commit | 3db994ee91a7ce77fd148085eedff7ed91665685 (patch) | |
tree | 233ce8a4132b0aa8fe258d754dd3a29eb7417a63 | |
parent | 8ff20d7c3e812a3f970010f696de9283010f552e (diff) | |
download | mesa-3db994ee91a7ce77fd148085eedff7ed91665685.tar.gz mesa-3db994ee91a7ce77fd148085eedff7ed91665685.tar.xz mesa-3db994ee91a7ce77fd148085eedff7ed91665685.zip |
- mesa-7.1-sis-ia64.patch: Fix sis driver on ia64. (#432428)mesa-7_1-0_10_fc9
-rw-r--r-- | mesa-7.1-sis-ia64.patch | 12 | ||||
-rw-r--r-- | mesa.spec | 7 |
2 files changed, 18 insertions, 1 deletions
diff --git a/mesa-7.1-sis-ia64.patch b/mesa-7.1-sis-ia64.patch new file mode 100644 index 0000000..a31f052 --- /dev/null +++ b/mesa-7.1-sis-ia64.patch @@ -0,0 +1,12 @@ +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 @@ -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 @@ Patch25: mesa-7.0-symlinks-before-depend.patch 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 @@ chmod a-x progs/demos/glslnoise.c %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/mesa-demos-data %changelog +* Tue Feb 12 2008 Adam Jackson <ajax@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@redhat.com> 7.1-0.9 - mesa-7.1-ia64-build-fix.patch: Fix build on ia64. (#427558) |