- up to 7.4.2

Changed files:
    Mesa-fixes.patch -> 1.2
    Mesa.spec -> 1.203

diff --git a/Mesa-fixes.patch b/Mesa-fixes.patch
deleted file mode 100644 (file)
index 1270e9b..0000000
--- a/Mesa-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c38397866d514d7776b0f876123be5718802482b Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Mon, 20 Apr 2009 22:12:16 +0000
-Subject: intel: added null screen->dri2.loader pointer check
-
-Fixes front-buffer rendering with DRI1.
----
-diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
-index ddcd264..ecaf6b4 100644
---- a/src/mesa/drivers/dri/intel/intel_context.c
-+++ b/src/mesa/drivers/dri/intel/intel_context.c
-@@ -534,7 +534,8 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
-    if ((ctx->DrawBuffer->Name == 0) && intel->front_buffer_dirty) {
-       __DRIscreen *const screen = intel->intelScreen->driScrnPriv;
- 
--      if ((screen->dri2.loader->base.version >= 2)
-+      if (screen->dri2.loader
-+          && (screen->dri2.loader->base.version >= 2)
-         && (screen->dri2.loader->flushFrontBuffer != NULL)) {
-        (*screen->dri2.loader->flushFrontBuffer)(intel->driDrawable,
-                                                 intel->driDrawable->loaderPrivate);
---
-cgit v0.8.2

diff --git a/Mesa.spec b/Mesa.spec
index 4ea0861908055ca0d275a070744421bd4dac8648..6a3a6af5797ee0654b4e56921f1be094324bcd20 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -18,18 +18,17 @@
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
-Version:       7.4.1
-Release:       2%{?with_multigl:.mgl}
+Version:       7.4.2
+Release:       1%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 423260578b653818ba66c2fcbde6d7ad
+# Source0-md5: b10a76e32bde4645cfc34ea0416d7d8b
 Source1:       http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 1e169fb6abc2b45613f1c98a82dfe690
+# Source1-md5: bf559a0485667a3bfa4513a23501579b
 Source2:       http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
 # Source2-md5: 6ae05158e678f4594343f32c2ca50515
 Patch0:                %{name}-realclean.patch
-Patch1:                %{name}-fixes.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: expat-devel
 BuildRequires: libdrm-devel >= 2.4.5
@@ -590,7 +589,6 @@ Sterownik X.org DRI dla rodziny kart VIA Unichrome.
 %prep
 %setup -q -b1 -a2
 %patch0 -p0
-%patch1 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"