Merge branch 'f19' into f20

Conflicts:
	mesa.spec

4 files changed, 7 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index 4afc30a..093975b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ mesa-20100720.tar.bz2
 /mesa-20130528.tar.xz
 /mesa-20130610.tar.xz
 /mesa-20130723.tar.xz
+/mesa-20130902.tar.xz
diff --git a/mesa-9.2-no-gallium-osmesa.patch b/mesa-9.2-no-gallium-osmesa.patch
deleted file mode 100644
index 15bfad7..0000000
--- a/mesa-9.2-no-gallium-osmesa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up mesa-20130514/configure.ac.jx mesa-20130514/configure.ac
---- mesa-20130514/configure.ac.jx	2013-05-17 13:51:14.000000000 -0400
-+++ mesa-20130514/configure.ac	2013-05-17 13:53:02.288582625 -0400
-@@ -763,11 +763,6 @@ if test "x$enable_dri" = xyes; then
-     GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS"
- fi
-
--if test "x$enable_osmesa" = xyes; then
--    GALLIUM_STATE_TRACKERS_DIRS="osmesa $GALLIUM_STATE_TRACKERS_DIRS"
--    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS osmesa"
--fi
--
- AC_SUBST([MESA_LLVM])
-
- # Check for libdrm
-diff -up mesa-20130514/src/gallium/targets/Makefile.am.jx mesa-20130514/src/gallium/targets/Makefile.am
---- mesa-20130514/src/gallium/targets/Makefile.am.jx	2013-05-17 13:51:14.000000000 -0400
-+++ mesa-20130514/src/gallium/targets/Makefile.am	2013-05-17 14:30:33.091558931 -0400
-@@ -26,10 +26,6 @@ if HAVE_X11_DRIVER
- SUBDIRS += libgl-xlib
- endif
-
--if HAVE_OSMESA
--SUBDIRS += osmesa
--endif
--
- if HAVE_GALLIUM_GBM
- SUBDIRS += gbm
- endif
diff --git a/mesa.spec b/mesa.spec
index 0fb0a20..68458dc 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -48,13 +48,13 @@
 
 %define _default_patch_fuzz 2
 
-%define gitdate 20130723
+%define gitdate 20130902
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 9.2
-Release: 0.15.%{gitdate}%{?dist}
+Release: 1.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,7 +75,6 @@ Patch9: mesa-8.0-llvmpipe-shmget.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch16: mesa-9.2-no-useless-vdpau.patch
-Patch19: mesa-9.2-no-gallium-osmesa.patch
 Patch20: mesa-9.2-evergreen-big-endian.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
@@ -301,7 +300,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 
 %patch15 -p1 -b .hwfloat
 %patch16 -p1 -b .vdpau
-%patch19 -p1 -b .osmesa
 %patch20 -p1 -b .egbe
 
 %if 0%{with_private_llvm}
@@ -602,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 02 2013 Dave Airlie <airlied@redhat.com> 9.2-1.20130902
+- 9.2 upstream release + fixes from git branch
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.2-0.15.20130723
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 928ecc8..201d693 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-322d77c41931530f5be496f7b543ac1e  mesa-20130723.tar.xz
+a87aedfb1bbd4522b576e99906131008  mesa-20130902.tar.xz