Mesa 9.1

4 files changed, 23 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 9f92262..b475cc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ mesa-20100720.tar.bz2
 /MesaLib-9.0.tar.bz2
 /MesaLib-9.0.1.tar.bz2
 /mesa-20130213.tar.xz
+/MesaLib-9.1.tar.bz2
diff --git a/intel-revert-gl3.patch b/intel-revert-gl3.patch
index 6ca79e6..e7fa559 100644
--- a/intel-revert-gl3.patch
+++ b/intel-revert-gl3.patch
@@ -1,8 +1,7 @@
-diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
-index 4e7b5da..1562f59 100755
---- a/src/mesa/drivers/dri/intel/intel_extensions.c
-+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
-@@ -135,9 +135,11 @@ intelInitExtensions(struct gl_context *ctx)
+diff -up Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c.jx Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c
+--- Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c.jx	2013-02-22 20:45:52.000000000 -0500
++++ Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c	2013-03-11 17:39:07.069991819 -0400
+@@ -137,9 +137,11 @@ intelInitExtensions(struct gl_context *c
        ctx->Extensions.ARB_seamless_cube_map = true;
        ctx->Extensions.ARB_shader_bit_encoding = true;
        ctx->Extensions.ARB_shader_texture_lod = true;
@@ -13,12 +12,11 @@ index 4e7b5da..1562f59 100755
 +#endif
        ctx->Extensions.ARB_texture_compression_rgtc = true;
        ctx->Extensions.ARB_texture_rg = true;
-       ctx->Extensions.ARB_vertex_type_2_10_10_10_rev = true;
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 750cb78..c0b63d3 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -1039,9 +1039,15 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
+       ctx->Extensions.ARB_texture_rgb10_a2ui = true;
+diff -up Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c.jx Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c
+--- Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c.jx	2013-02-22 20:46:23.000000000 -0500
++++ Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c	2013-03-11 17:40:31.235111004 -0400
+@@ -1038,9 +1038,15 @@ intel_screen_make_configs(__DRIscreen *d
  static void
  set_max_gl_versions(struct intel_screen *screen)
  {
@@ -35,19 +33,19 @@ index 750cb78..c0b63d3 100644
           screen->max_gl_core_version = 31;
           screen->max_gl_compat_version = 30;
           screen->max_gl_es1_version = 11;
-@@ -1054,10 +1060,17 @@ set_max_gl_versions(struct intel_screen *screen)
+@@ -1053,10 +1059,17 @@ set_max_gl_versions(struct intel_screen
        }
        break;
     case 6:
 -      screen->max_gl_core_version = 31;
 -      screen->max_gl_compat_version = 30;
 -      screen->max_gl_es1_version = 11;
--      screen->max_gl_es2_version = 20;
+-      screen->max_gl_es2_version = 30;
 +      if (has_texture_float) {
 +         screen->max_gl_core_version = 31;
 +         screen->max_gl_compat_version = 30;
 +         screen->max_gl_es1_version = 11;
-+         screen->max_gl_es2_version = 20;
++         screen->max_gl_es2_version = 30;
 +      } else {
 +         screen->max_gl_core_version = 0;
 +         screen->max_gl_compat_version = 21;
diff --git a/mesa.spec b/mesa.spec
index 8aba8ec..cad6ce4 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -43,21 +43,20 @@
 
 %define _default_patch_fuzz 2
 
-%define gitdate 20130213
+#define gitdate 20130213
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 9.1
-Release: 0.4%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 
-#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
-#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.xz
+Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.xz
 Source3: make-git-snapshot.sh
 
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
@@ -280,8 +279,8 @@ Group: System Environment/Libraries
 Mesa shared glapi
 
 %prep
-#%setup -q -n Mesa-%{version}%{?snapshot}
-%setup -q -n mesa-%{gitdate}
+%setup -q -n Mesa-%{version}%{?snapshot}
+#setup -q -n mesa-%{gitdate}
 %patch0 -p1 -b .nv50rtti
 %patch1 -p1 -b .nogl3
 #%patch11 -p1 -b .nouveau
@@ -590,6 +589,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 08 2013 Adam Jackson <ajax@redhat.com> 9.1-1
+- Mesa 9.1
+
 * Wed Feb 27 2013 Dan Horák <dan[at]danny.cz> - 9.1-0.4
 - /etc/drirc is always created, so exclude it on platforms without hw drivers
 
diff --git a/sources b/sources
index 51ab5b4..9dba37c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e06a31b73be406581f3539809f4aa7ec  mesa-20130213.tar.xz
+d3891e02215422e120271d976ff1947e  MesaLib-9.1.tar.bz2