From 1f6c63f5139ddfc65c4fa08c6db6f85069e34678 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Sep 16 2011 08:13:44 +0000
Subject: Merge branch 'f16' into f15


---

diff --git a/mesa-7.11-generic-wmb.patch b/mesa-7.11-generic-wmb.patch
new file mode 100644
index 0000000..618d836
--- /dev/null
+++ b/mesa-7.11-generic-wmb.patch
@@ -0,0 +1,12 @@
+diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
+--- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx	2010-12-14 16:43:15.000000000 -0500
++++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h	2011-09-09 11:47:56.454465358 -0400
+@@ -405,7 +405,7 @@ struct sis_context
+ #elif defined(__ia64__)
+ #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
+ #else
+-#error platform needs WMB
++#define MMIO_WMB()	__sync_synchronize()
+ #endif
+ 
+ #define mEndPrimitive()  \
diff --git a/mesa.spec b/mesa.spec
index 36fdab0..dd627e8 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -26,7 +26,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.11
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -47,6 +47,7 @@ Patch8: mesa-7.10-llvmcore.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.10-swrastg.patch
+Patch32: mesa-7.11-generic-wmb.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -133,6 +134,14 @@ Requires: mesa-dri-filesystem%{?isa}
 %description dri-drivers-dri1
 Mesa-based DRI1 drivers.
 
+%package -n khrplatform-devel
+Summary: Khronos platform development package
+Group: Development/Libraries
+BuildArch: noarch
+
+%description -n khrplatform-devel
+Khronos platform development package
+
 %package libGL-devel
 Summary: Mesa libGL development package
 Group: Development/Libraries
@@ -147,6 +156,7 @@ Mesa libGL development package
 Summary: Mesa libEGL development package
 Group: Development/Libraries
 Requires: mesa-libEGL = %{version}-%{release}
+Requires: khrplatform-devel >= %{version}-%{release}
 
 %description libEGL-devel
 Mesa libEGL development package
@@ -155,6 +165,7 @@ Mesa libEGL development package
 Summary: Mesa libGLES development package
 Group: Development/Libraries
 Requires: mesa-libGLES = %{version}-%{release}
+Requires: khrplatform-devel >= %{version}-%{release}
 
 %description libGLES-devel
 Mesa libGLES development package
@@ -210,6 +221,7 @@ Mesa offscreen rendering development package
 %patch8 -p1 -b .llvmcore
 %patch30 -p1 -b .vblank-warning
 #patch31 -p1 -b .swrastg
+%patch32 -p1 -b .wmb
 
 %build
 
@@ -258,6 +270,10 @@ rm -rf $RPM_BUILD_ROOT
 # core libs and headers, but not drivers.
 make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 
+# not installed by make install, grr
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/KHR
+install -m 0644 include/KHR/*.h $RPM_BUILD_ROOT%{_includedir}/KHR
+
 # just the DRI drivers that are sane
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 # use gallium driver iff built
@@ -370,6 +386,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/dri/tdfx_dri.so
 %endif
 
+%files -n khrplatform-devel
+%defattr(-,root,root,-)
+%{_includedir}/KHR
+
 %files libGL-devel
 %defattr(-,root,root,-)
 %{_includedir}/GL/gl.h
@@ -440,6 +460,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/osmesa.pc
 
 %changelog
+* Fri Sep 09 2011 Adam Jackson <ajax@redhat.com> 7.11-4
+- mesa-7.11-generic-wmb.patch: Add generic write memory barrier macro for
+  non-PC arches.
+
+* Thu Sep 08 2011 Adam Jackson <ajax@redhat.com> 7.11-3
+- Add khrplatform-devel subpackage so {EGL,GLES}-devel are usable
+
+* Wed Aug  3 2011 Michel Salim <salimma@fedoraproject.org> - 7.11-2
+- Rebuild against final LLVM 2.9 release
+
 * Tue Aug 02 2011 Adam Jackson <ajax@redhat.com> 7.11-1
 - Mesa 7.11
 - Redo the driver arch exclusion, yet again.  Dear secondary arches: unless