Accepting request 160489 from home:k0da:ppc

- Don't enable xa on ppc and ppc64
- Fix glapi_dispatch #bfo56710 (u_mesa-glapi_dispatch.patch)

OBS-URL: https://build.opensuse.org/request/show/160489
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=280

Mesa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

Mesa.spec

@@ -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 \

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 */