From aa93b88a4d162473ed531840ba3e3836e021be0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@fedoraproject.org>
Date: Sat, 1 Apr 2006 06:05:02 +0000
Subject: [PATCH] - Update to mesa 6.5 snapshot. - Drop
 mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch and    
 mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch     as
 these are upstream now. - Drop mesa-6.4.1-texture-from-drawable.patch and add
     mesa-6.5-texture-from-pixmap-fixes.patch. - Update
 mesa-modular-dri-dir.patch to apply.

---
 .cvsignore |  5 ++---
 mesa.spec  | 32 ++++++++++++++++++--------------
 sources    |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8ab848c..a74f510 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-*.tar.bz2
-*.tar.gz
-clog
+MesaDemos-6.5.tar.bz2
+MesaLib-6.5.tar.bz2
diff --git a/mesa.spec b/mesa.spec
index 5c70a9e..f74556e 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -52,8 +52,8 @@
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 6.4.2
-Release: 6
+Version: 6.5
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -67,20 +67,16 @@ Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{versi
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
-#Patch0: mesa-6.3.2-makedepend.patch
 Patch0: mesa-6.3.2-build-configuration-v4.patch
 Patch1: mesa-6.3.2-fix-installmesa.patch
 Patch2: mesa-6.4-multilib-fix.patch
 Patch3: mesa-modular-dri-dir.patch
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
-Patch5: mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch
-Patch6: mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
-#Patch4: mesa-6.4.1-enable-osmesa.patch
 
 # General patches from upstream go here:
 
 # Red Hat custom patches, feature development
-Patch200: mesa-6.4.1-texture-from-drawable.patch
+Patch200: mesa-6.5-texture-from-pixmap-fixes.patch
 Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
 
 BuildRequires: pkgconfig
@@ -241,16 +237,12 @@ install -m 755 %{SOURCE12} ./
 %if %{with_motif}
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
-%patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
-%patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
 
-# NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
-
-%patch200 -p0 -b .texture-from-drawable
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
 # a change for post feature freeze.  Leaving off for now...
-#%patch201 -p1 -b .radeon-use-right-format
+%patch200 -p0 -b  texture-from-pixmap-fixes
+%patch201 -p1 -b .radeon-use-right-format
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -259,7 +251,7 @@ rm include/GL/uglglutshapes.h
 #-- Build ------------------------------------------------------------
 %build
 # Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend"
+%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MF depend" ARCH_FLAGS=-DGLX_USE_TLS
 export CFLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -438,6 +430,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glxinfo
 
 %changelog
+* Sat Apr  1 2006 Kristian Høgsberg <krh@redhat.com> 6.5-1
+- Update to mesa 6.5 snapshot.
+- Drop mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch and
+  mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
+  as these are upstream now.
+- Drop mesa-6.4.1-texture-from-drawable.patch and add
+  mesa-6.5-texture-from-pixmap-fixes.patch.
+- Update mesa-modular-dri-dir.patch to apply.
+
+* Fri Mar 24 2006 Kristian Høgsberg <krh@redhat.com> 6.4.2-7
+- Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.
+
 * Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 6.4.2-6
 - Buildrequires: libXt-devel (#183479)
 
diff --git a/sources b/sources
index 1a79018..882ffab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
-9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2
+ab95b590dcd640726a2d89e62068c66e  MesaDemos-6.5.tar.bz2
+61beda590bfc5b4a12e979d5f2d70d7a  MesaLib-6.5.tar.bz2