Today's git snapshot

2012-01-05 14:56:38 -05:00 · 2012-01-05 14:56:38 -05:00 · 748b3871c7
commit 748b3871c7
parent 45f1c9cd92
4 changed files with 13 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,4 @@ mesa-20100720.tar.bz2
 /mesa-20111114.tar.xz
 /mesa-20111129.tar.xz
 /mesa-20111214.tar.xz
+/mesa-20120105.tar.xz
--- a/mesa-7.10-llvmcore.patch
+++ b/mesa-7.10-llvmcore.patch
@ -1,10 +1,10 @@
-diff -up mesa-20111114/configure.ac.dma mesa-20111114/configure.ac
--- mesa-20111114/configure.ac.dma	2011-11-14 15:57:16.783162469 +0000
-+++ mesa-20111114/configure.ac	2011-11-14 15:58:07.877159762 +0000
-@@ -1742,7 +1742,7 @@ if test "x$enable_gallium_llvm" = xyes;
+diff -up mesa-20120105/configure.ac.jx mesa-20120105/configure.ac
+--- mesa-20120105/configure.ac.jx	2012-01-05 14:03:26.000000000 -0500
+++ mesa-20120105/configure.ac	2012-01-05 14:35:14.559990582 -0500
+@@ -1775,7 +1775,7 @@ if test "x$enable_gallium_llvm" = xyes;
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version`
- 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'`
+ 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
 -	LLVM_LIBS="`$LLVM_CONFIG --libs`"
 +	LLVM_LIBS="-lLLVM-`llvm-config --version` -lstdc++"
 
--- a/mesa.spec
+++ b/mesa.spec
@ -24,13 +24,13 @@
 %define _default_patch_fuzz 2

 %define manpages gl-manpages-1.0.1
-%define gitdate 20111214
+%define gitdate 20120105
 #% define snapshot 

 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.12
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@ -371,6 +371,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/EGL
 %{_includedir}/EGL/eglext.h
 %{_includedir}/EGL/egl.h
+%{_includedir}/EGL/eglmesaext.h
 %{_includedir}/EGL/eglplatform.h
 %dir %{_includedir}/KHR
 %{_includedir}/KHR/khrplatform.h
@ -420,6 +421,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/osmesa.pc

 %changelog
+* Thu Jan 05 2012 Adam Jackson <ajax@redhat.com> 7.12-0.7
+- Today's git snapshot
+
 * Wed Dec 14 2011 Adam Jackson <ajax@redhat.com> 7.12-0.6
 - Today's git snapshot
 - Disable hardware drivers on ppc* in RHEL
--- a/1
+++ b/1
@ -1,2 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 7dd221f4edf3c1836d135b8c14ed4995  mesa-20111214.tar.xz
+d5e46cbe1d8e7f62341d4f18ff25deb1  mesa-20120105.tar.xz