Accepting request 81830 from X11:XOrg

- Fix openSUSE 11.3 11.4 build

- Update to Mesa 7.11 final

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

FIX_BUILD_WITH_LLVM.patch

@@ -0,0 +1,44 @@
+From 4a468de2d78fc5a9e6de40a9dae09669ec556fc5 Mon Sep 17 00:00:00 2001
+From: Tobias Droste <tdroste@gmx.de>
+Date: Sun, 04 Sep 2011 01:14:23 +0000
+Subject: gallivm: fix build with LLVM 3.0svn
+
+LLVM 3.0svn moved TargetRegistry.h and TargetSelect.h.
+See revision 138450 of LLVM.
+
+Signed-off-by: Tobias Droste <tdroste@gmx.de>
+---
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index e252607..401e0e2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -27,17 +27,23 @@
+ 
+ #include <llvm-c/Core.h>
+ #include <llvm/Target/TargetMachine.h>
+-#include <llvm/Target/TargetRegistry.h>
+-#include <llvm/Target/TargetSelect.h>
+ #include <llvm/Target/TargetInstrInfo.h>
+ #include <llvm/Support/raw_ostream.h>
+ #include <llvm/Support/MemoryObject.h>
+ 
++#if HAVE_LLVM >= 0x0300
++#include <llvm/Support/TargetRegistry.h>
++#include <llvm/Support/TargetSelect.h>
++#else /* HAVE_LLVM < 0x0300 */
++#include <llvm/Target/TargetRegistry.h>
++#include <llvm/Target/TargetSelect.h>
++#endif /* HAVE_LLVM < 0x0300 */
++
+ #if HAVE_LLVM >= 0x0209
+ #include <llvm/Support/Host.h>
+-#else
++#else /* HAVE_LLVM < 0x0209 */
+ #include <llvm/System/Host.h>
+-#endif
++#endif /* HAVE_LLVM < 0x0209 */
+ 
+ #if HAVE_LLVM >= 0x0207
+ #include <llvm/MC/MCDisassembler.h>
+--
+cgit v0.9.0.2-2-gbebe

Mesa.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep  9 15:08:02 UTC 2011 - vljn@ovi.com
+
+- Fix openSUSE 11.3 11.4 build
+
+-------------------------------------------------------------------
+Sun Sep  4 21:00:43 UTC 2011 - vljn@ovi.com
+
+- Update to Mesa 7.11 final 
+
 -------------------------------------------------------------------
 Sun Sep  4 12:34:37 CEST 2011 - meissner@suse.de
 

Mesa.spec

@@ -17,7 +17,7 @@
 
 # norootforbuild
 
-%define _version 7.11-rc3
+%define _version 7.11
 
 Version:        7.11
 Release:        3
@@ -53,6 +53,9 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # already upstream
 Patch13:        U_Mesa-7.11-llvm3.patch
 Patch14:        U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
+%if 0%{?suse_version} <= 1140
+Patch15:        FIX_BUILD_WITH_LLVM.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -124,6 +127,10 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch13 -p0
 %patch14 -p1
 
+%if 0%{?suse_version} <= 1140
+%patch15 -p1
+%endif
+
 %build
 
 %install

MesaLib-7.11-rc3.tar.bz2

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

MesaLib-7.11.tar.bz2

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