--- cauldron/mesa/current/SPECS/mesa.spec	2012/12/29 18:56:05	336174
+++ cauldron/mesa/current/SPECS/mesa.spec	2012/12/29 18:58:23	336175
@@ -15,17 +15,17 @@
 %define _disable_ld_no_undefined 1
 
 
-%define git 0
-%define git_branch 9.0
+%define git 20121228
+%define git_branch 9.1
 %define with_hardware 1
 
 %define opengl_ver 3.0
 
 %define relc			0
 %define	name			mesa
-%define fversion		9.0.1
-%define version			9.0.1
-%define rel			3
+%define fversion		9.1.0
+%define version			9.1.0
+%define rel			1
 
 %define release			%mkrel %{rel}
 %define src_type tar.bz2
@@ -144,7 +144,7 @@
 BuildRequires:	libxml2-python
 BuildRequires:	makedepend
 BuildRequires:  bison flex
-BuildRequires:  llvm-devel >= 3.1
+BuildRequires:  llvm-devel > 3.2-1.mga3
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(vdpau)
 %if %{enable_wayland}
@@ -153,8 +153,9 @@
 
 URL:		http://www.mesa3d.org
 %if %{git}
+Source0:	%{name}-%{git}.tar.bz2
 # (blino) snapshot of 9.0 branch
-Source0:	%{name}-%{git_branch}-%{git}.tar.bz2
+#Source0:	%{name}-%{git_branch}-%{git}.tar.bz2
 %else
 Source0:	ftp://ftp.freedesktop.org/pub/mesa/%version/MesaLib-%{fversion}%{vsuffix}.%{src_type}
 %endif
@@ -191,7 +192,6 @@
 # (blino) llvmpipe test programs link fails when ld --as-needed option is used, reported as fdo #52167
 Patch901: 0901-gallium-only-link-static-archives-between-ld-start-e.patch
 
-
 #------------------------------------------------------------------------------
 
 # package mesa
@@ -532,21 +532,24 @@
 
 %prep
 %if %{git}
-%setup -q -n mesa-%{git_branch}-%{git}
+%setup -q -n mesa-%{git}
+#setup -q -n mesa-%{git_branch}-%{git}
 %else
 %setup -q -n Mesa-%{fversion}%{vsuffix}
 %endif
 
 %apply_patches
-autoreconf -vfi
 
 # Duplicate source tree for OSMesa, since building both versions out-of-tree
 # would break build. - Anssi 12/2012
-all=$(ls)
-mkdir -p build-osmesa
-cp -a $all build-osmesa
+#all=$(ls)
+#mkdir -p build-osmesa
+#cp -a $all build-osmesa
 
 %build
+# (re)generate auto* generated files using our autotools and libtoolize
+autoreconf -vfi
+
 # fix build - TODO: should this be fixed in llvm somehow, or maybe the library
 # symlinks should be moved to %{_libdir}? -Anssi 08/2012
 export LDFLAGS="-L%{_libdir}/llvm"
@@ -555,7 +558,6 @@
 		--enable-glx \
 		--with-dri-driverdir=%{driver_dir} \
 		--with-dri-drivers="%{dri_drivers}" \
-		--enable-shared-dricore \
 %if %{enable_egl}
 		--enable-egl \
 %else
@@ -573,7 +575,7 @@
 		--enable-gallium-g3dvl \
 		--disable-xvmc \
 		--enable-vdpau \
-		--disable-va \
+		--enable-osmesa \
 %if %{with_hardware}
 		--with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
 		--enable-gallium-llvm \
@@ -592,21 +594,21 @@
 # See e.g. https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1066599
 # -Anssi 12/2012
 
-pushd build-osmesa
-%configure2_5x \
-		--enable-osmesa \
-		--disable-dri \
-		--disable-glx \
-		--disable-egl \
-		--disable-shared-glapi \
-		--without-gallium-drivers
-popd
+#pushd build-osmesa
+#configure2_5x \
+#		--enable-osmesa \
+#		--disable-dri \
+#		--disable-glx \
+#		--disable-egl \
+#		--disable-shared-glapi \
+#		--without-gallium-drivers
+#popd
 
 %make
-%make -C build-osmesa
+#make -C build-osmesa
 
 %install
-%makeinstall_std -C build-osmesa
+#makeinstall_std -C build-osmesa
 %makeinstall_std
 
 # FIXME: strip will likely break the hardlink
@@ -726,7 +728,7 @@
 %{_libdir}/pkgconfig/dri.pc
 
 #FIXME: check those headers
-%{_includedir}/GL/vms_x_fix.h
+#{_includedir}/GL/vms_x_fix.h
 %{_includedir}/GL/wmesa.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
@@ -764,6 +766,7 @@
 %files -n %{libglesv2name}-devel
 %defattr(-,root,root)
 %{_includedir}/GLES2
+%{_includedir}/GLES3
 %{_libdir}/libGLESv2.so
 %{_libdir}/pkgconfig/glesv2.pc