[mesa/f18] Mesa 9.0.3

[Adam Jackson]

commit 92fbd6021aff0ace856465a9a9876f9dfa5e244c
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 5 13:52:01 2013 -0500

    Mesa 9.0.3

 .gitignore                       |    1 +
 mesa-9-r600g-limit-memory.patch  |  278 ------
 mesa-9.0.1-22-gd0a9ab2.patch     | 1834 --------------------------------------
 mesa-9.0.1-less-cxx-please.patch |   15 +-
 mesa.spec                        |   20 +-
 sources                          |    2 +-
 6 files changed, 20 insertions(+), 2130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 865e321..8d4e905 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ mesa-20100720.tar.bz2
 /glu-9.0.0.tar.bz2
 /MesaLib-9.0.tar.bz2
 /MesaLib-9.0.1.tar.bz2
+/MesaLib-9.0.3.tar.bz2
diff --git a/mesa-9.0.1-less-cxx-please.patch b/mesa-9.0.1-less-cxx-please.patch
index 4882782..962b8bc 100644
--- a/mesa-9.0.1-less-cxx-please.patch
+++ b/mesa-9.0.1-less-cxx-please.patch
@@ -1,13 +1,12 @@
-diff -up Mesa-9.0.1/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.jx Mesa-9.0.1/src/gallium/drivers/nv50/codegen/nv50_ir.cpp
---- Mesa-9.0.1/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.jx	2012-08-31 19:33:41.000000000 -0400
-+++ Mesa-9.0.1/src/gallium/drivers/nv50/codegen/nv50_ir.cpp	2012-12-20 12:58:02.115699825 -0500
-@@ -715,7 +715,9 @@ Instruction::clone(ClonePolicy<Function>
+diff -up Mesa-9.0.3/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.jx Mesa-9.0.3/src/gallium/drivers/nv50/codegen/nv50_ir.cpp
+--- Mesa-9.0.3/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.jx	2013-02-17 14:28:36.000000000 -0500
++++ Mesa-9.0.3/src/gallium/drivers/nv50/codegen/nv50_ir.cpp	2013-03-05 09:27:35.140943844 -0500
+@@ -715,7 +715,7 @@ Instruction::clone(ClonePolicy<Function>
  {
     if (!i)
        i = new_Instruction(pol.context(), op, dType);
-+#ifdef __GXX_RTTI
+-#ifndef NDEBUG // non-conformant assert, so this is required
++#if 0
     assert(typeid(*i) == typeid(*this));
-+#endif
- 
-    pol.set<Instruction>(this, i);
+ #endif
  
diff --git a/mesa.spec b/mesa.spec
index f08e499..4b3a192 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -47,8 +47,8 @@
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 9.0.1
-Release: 5%{?dist}
+Version: 9.0.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -60,14 +60,13 @@ Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar
 Source3: make-git-snapshot.sh
 
 # $ git diff-tree -p mesa-9.0.1..origin/9.0 > `git describe origin/9.0`.patch
-Patch0: mesa-9.0.1-22-gd0a9ab2.patch
+#Patch0: mesa-9.0.1-22-gd0a9ab2.patch
 
 #Patch7: mesa-7.1-link-shared.patch
 Patch9: mesa-8.0-llvmpipe-shmget.patch
 Patch11: mesa-8.0-nouveau-tfp-blacklist.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch13: mesa-9.0.1-less-cxx-please.patch
-Patch14: mesa-9-r600g-limit-memory.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -276,7 +275,7 @@ Mesa shared glapi
 %prep
 %setup -q -n Mesa-%{version}%{?snapshot}
 #setup -q -n mesa-%{gitdate}
-%patch0 -p1 -b .git
+#patch0 -p1 -b .git
 %patch11 -p1 -b .nouveau
 
 # this fastpath is:
@@ -292,8 +291,6 @@ Mesa shared glapi
 
 %patch13 -p1 -b .less-cpp
 
-%patch14 -p1 -b .r600g-limit
-
 # default to dri (not xlib) for libGL on all arches
 # XXX please fix upstream
 sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac
@@ -315,13 +312,15 @@ sed -i 's/\<libdrm_nouveau\>/&2/' configure.ac
 
 autoreconf --install  
 
-export CFLAGS="$RPM_OPT_FLAGS"
+# the NDEBUG thing is a hack for llvm 3.1 at least. will be removed once
+# i fix llvm to be less stupid [ajax]
+export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 # C++ note: we never say "catch" in the source.  we do say "typeid" once,
 # in an assert, which is patched out above.  LLVM doesn't use RTTI or throw.
 #
 # We do say 'catch' in the clover and d3d1x state trackers, but we're not
 # building those yet.
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
+export CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
 %ifarch %{ix86}
 # i do not have words for how much the assembly dispatch code infuriates me
 %define common_flags --enable-selinux --enable-pic --disable-asm
@@ -578,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar 05 2013 Adam Jackson <ajax at redhat.com> 9.0.3-1
+- Mesa 9.0.3
+
 * Wed Feb 27 2013 Dan Horák <dan[at]danny.cz>
 - /etc/drirc is always created, so exclude it on platforms without hw drivers
 
diff --git a/sources b/sources
index ce5e182..4bd42df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97d6554c05ea7449398afe3a0ede7018  MesaLib-9.0.1.tar.bz2
+d7515cc5116c72ac63d735655bd63689  MesaLib-9.0.3.tar.bz2