Accepting request 160491 from X11:XOrg

- Don't enable xa on ppc and ppc64
- Fix glapi_dispatch #bfo56710 (u_mesa-glapi_dispatch.patch) (forwarded request 160489 from k0da)

OBS-URL: https://build.opensuse.org/request/show/160491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=171

Mesa.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Mar 21 12:19:56 UTC 2013 - dvaleev@suse.com
+
+- Don't enable xa on ppc and ppc64
+- Fix glapi_dispatch #bfo56710 (u_mesa-glapi_dispatch.patch) 
+
+-------------------------------------------------------------------
+Wed Mar 20 11:10:38 UTC 2013 - hrvoje.senjan@gmail.com
+
+- update to Mesa 9.1.1: a bugfix release
+ * [GM45] mesa demos spriteblast render incorrectly (fdo#30232)
+ * [gles2] Ironlake: gl_PointCoord takes no effect for point sprites
+   (fd0#32429)
+ * Mesa 7.11-devel implementation error: Unexpected program target 
+   in destroy_program_variants_cb() (fdo#38086)
+ * [snb] corrupted GLSL built-in function results when using Uniform 
+   Buffer contents as arguments (fdo#57121)
+ * Garbled UI in Team Fortress 2 and Counter-Strike: Source 
+   (fdo#58042)
+ * Texture flicker with fragment shader (fdo#58960)
+ * [i965]Oglc fbblit(advanced.blitFb-3d-cube.mirror.both) fails 
+   (fdo#59495)
+ * [IVB] 3DMMES2.0 Taiji performance reduced by ~13% with 
+   gnome-session enable compositing (fdo#59783)
+ * build - libvdpau_softpipe fails at runtime. (fdo#60121)
+ * gbm_dri_bo_create fails to initialize bo->base.base.format 
+   (fdo#60143)
+ * Corruption with DMA ring on cayman (fdo#60802)
+ * r600g: add htile support cause gpu lockup in Dishonored wine. 
+   (fdo#60848)
+ * [softpipe] piglit interpolation-noperspective-gl_BackColor-flat-fixed 
+   regression (fdo#60938)
+ * alloc_layout_array tx * ty assertion failure when making pbuffer 
+   current (fdo#61012)
+ * Segfault in glBitmap when called with PBO source (fdo#61026)
+
+-------------------------------------------------------------------
+Mon Mar 18 11:00:12 UTC 2013 - mmeister@suse.com
+
+- Added Download Link to Source section in spec file
+
 -------------------------------------------------------------------
 Sat Mar  2 02:51:10 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 

Mesa.spec

@@ -17,11 +17,11 @@
 
 
 %define glamor 1
-%define _version 9.1
+%define _version 9.1.1
 %define _name_archive MesaLib
 
 Name:           Mesa
-Version:        9.1
+Version:        9.1.1
 Release:        0
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -81,7 +81,7 @@ Provides:       XFree86-Mesa-64bit = %{version}
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
 Group:          System/Libraries
-Source:         %{_name_archive}-%{version}.tar.bz2
+Source:         ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{_name_archive}-%{version}.tar.bz2
 Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
@@ -93,6 +93,8 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch to remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag
 Patch14:        u_remove-os-abi-tag.patch
+# Patch to fix glapi_dispatch include 
+Patch15:        u_mesa-glapi_dispatch.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch16:        u_mesa-8.0-llvmpipe-shmget.patch
 
@@ -524,6 +526,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch16 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 
@@ -545,7 +548,6 @@ autoreconf -fi
            --enable-dri \
            --with-egl-platforms=$egl_platforms \
            --enable-shared-glapi \
-           --enable-xa \
            --enable-texture-float \
 %if %glamor
            --enable-gbm \
@@ -553,6 +555,7 @@ autoreconf -fi
 %endif
            --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
 %ifarch armv7hl %ix86 x86_64
+           --enable-xa \
            --enable-gallium-llvm \
            --with-dri-drivers=i915,i965,nouveau,r200,radeon \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga \

MesaLib-9.1.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb
+size 6122510

MesaLib-9.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b
-size 6125400

u_mesa-glapi_dispatch.patch

@@ -0,0 +1,22 @@
+commit f00ab2e655d442c2004cb9e3ba6cec1cfe812f9b
+Author: Dinar Valeev <dvaleev@suse.com>
+Date:   Thu Mar 21 17:31:35 2013 +0100
+
+    fix #bfo56710 glapi_dispatch inclide
+    
+    Reference: https://bugs.freedesktop.org/show_bug.cgi?id=56710
+    Patch by Matt Turner (mattst88 at gmail.com)
+
+diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
+index be65ebe..5a0897e 100644
+--- a/src/mapi/glapi/glapi_dispatch.c
++++ b/src/mapi/glapi/glapi_dispatch.c
+@@ -86,7 +86,7 @@
+ #ifdef GLX_INDIRECT_RENDERING
+ /* those link to libglapi.a should provide the entry points */
+ #define _GLAPI_SKIP_PROTO_ENTRY_POINTS
+-#endif
+ #include "glapi/glapitemp.h"
++#endif
+ 
+ #endif /* USE_X86_ASM */