Accepting request 82165 from home:namtrac:bugfix

- Fix build with newest llvm, fdo#40754

- Fix build with Factory

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

FIX_BUILD_WITH_LLVM.patch

@@ -1,44 +0,0 @@
-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-llvm-3.0.patch

@@ -0,0 +1,95 @@
+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
+From 973221968117c50b141b700350d2e83befff4fce Mon Sep 17 00:00:00 2001
+From: ojab <ojab@ojab.ru>
+Date: Sat, 10 Sep 2011 19:23:20 +0400
+Subject: [PATCH] gallivm: fix build with LLVM 3.0svn
+
+LLVM 3.0svn refactored instprinter and mcdisassembler to take a SubtargetInfo.
+See revision 139237 of LLVM.
+---
+ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index 401e0e2..b8a97da 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -210,11 +210,20 @@ lp_disassemble(const void* func)
+       return;
+    }
+ 
++#if HAVE_LLVM >= 0x0300
++   const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple.c_str(), "", "");
++   if (!STI) {
++      debug_printf("error: no subtarget info for target %s\n", Triple.c_str());
++      return;
++   }
++   OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
++#else
+    OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
+    if (!DisAsm) {
+       debug_printf("error: no disassembler for target %s\n", Triple.c_str());
+       return;
+    }
++#endif
+ 
+    raw_debug_ostream Out;
+ 
+@@ -223,7 +232,10 @@ lp_disassemble(const void* func)
+ #else
+    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+-#if HAVE_LLVM >= 0x0208
++#if HAVE_LLVM >= 0x0300
++   OwningPtr<MCInstPrinter> Printer(
++	 T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
++#elif HAVE_LLVM >= 0x0208
+    OwningPtr<MCInstPrinter> Printer(
+          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
+ #else
+-- 
+1.7.6
+

Mesa.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep 15 06:15:04 UTC 2011 - idonmez@suse.com
+
+- Fix build with newest llvm, fdo#40754
+
+-------------------------------------------------------------------
+Tue Sep 13 12:03:25 UTC 2011 - idonmez@suse.com
+
+- Fix build with Factory 
+
 -------------------------------------------------------------------
 Mon Sep 12 23:48:34 UTC 2011 - sndirsch@suse.com
 

Mesa.spec

@@ -53,9 +53,7 @@ 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:        Mesa-llvm-3.0.patch
-Patch15:        FIX_BUILD_WITH_LLVM.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -126,10 +124,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch11 -p1
 %patch13 -p0
 %patch14 -p1
-
-%if 0%{?suse_version} <= 1140
 %patch15 -p1
-%endif
 
 %build