Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Mon Sep 19 15:26:09 CEST 2011.
-------- --- Mesa/Mesa.changes 2011-09-09 17:08:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2011-09-15 08:16:01.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Sep 15 06:15:04 UTC 2011 - [email protected] + +- Fix build with newest llvm, fdo#40754 + +------------------------------------------------------------------- +Tue Sep 13 12:03:25 UTC 2011 - [email protected] + +- Fix build with Factory + +------------------------------------------------------------------- +Mon Sep 12 23:48:34 UTC 2011 - [email protected] + +- revert previous change since it actually *broke* the build with + Factory + +------------------------------------------------------------------- +Mon Sep 12 10:47:17 UTC 2011 - [email protected] + +- Fix build with Factory too + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FIX_BUILD_WITH_LLVM.patch New: ---- Mesa-llvm-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.DMDPon/_old 2011-09-19 15:26:01.000000000 +0200 +++ /var/tmp/diff_new_pack.DMDPon/_new 2011-09-19 15:26:01.000000000 +0200 @@ -53,9 +53,7 @@ # 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 +Patch15: Mesa-llvm-3.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -126,10 +124,7 @@ %patch11 -p1 %patch13 -p0 %patch14 -p1 - -%if 0%{?suse_version} <= 1140 %patch15 -p1 -%endif %build ++++++ Mesa-llvm-3.0.patch ++++++ >From 4a468de2d78fc5a9e6de40a9dae09669ec556fc5 Mon Sep 17 00:00:00 2001 From: Tobias Droste <[email protected]> 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 <[email protected]> --- 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 <[email protected]> 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
