Author: baggins Date: Sat Jun 2 16:28:54 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - fix building with llvm 3.1
---- Files affected: packages/Mesa: Mesa.spec (1.325 -> 1.326) , llvm-3.1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/Mesa/Mesa.spec diff -u packages/Mesa/Mesa.spec:1.325 packages/Mesa/Mesa.spec:1.326 --- packages/Mesa/Mesa.spec:1.325 Sat Jun 2 12:57:55 2012 +++ packages/Mesa/Mesa.spec Sat Jun 2 18:28:48 2012 @@ -32,7 +32,7 @@ Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa Version: 8.0.3 -Release: 2 +Release: 3 License: MIT (core), SGI (GLU) and others - see license.html file Group: X11/Libraries Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Patch0: %{name}-realclean.patch Patch1: %{name}-link.patch Patch2: %{name}-wayland.patch +Patch3: llvm-3.1.patch URL: http://www.mesa3d.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -887,6 +888,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__aclocal} @@ -1340,6 +1342,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.326 2012/06/02 16:28:48 baggins +- rel 3 +- fix building with llvm 3.1 + Revision 1.325 2012/06/02 10:57:55 arekm - release 2 ================================================================ Index: packages/Mesa/llvm-3.1.patch diff -u /dev/null packages/Mesa/llvm-3.1.patch:1.1 --- /dev/null Sat Jun 2 18:28:54 2012 +++ packages/Mesa/llvm-3.1.patch Sat Jun 2 18:28:48 2012 @@ -0,0 +1,131 @@ +From 563489e5c922481a9a506fc5405a3dacacd6082e Mon Sep 17 00:00:00 2001 +From: José Fonseca <[email protected]> +Date: Tue, 15 May 2012 12:10:26 +0000 +Subject: gallivm: Add MCRegisterInfo.h to silence benign warnings about missing implementation. + +Trivial. +--- +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index 9cf2094..444b70a 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -53,6 +53,9 @@ + #include <llvm/MC/MCInst.h> + #include <llvm/MC/MCInstPrinter.h> + #endif /* HAVE_LLVM >= 0x0207 */ ++#if HAVE_LLVM >= 0x0301 ++#include <llvm/MC/MCRegisterInfo.h> ++#endif /* HAVE_LLVM >= 0x0301 */ + + #include "util/u_math.h" + #include "util/u_debug.h" +-- +cgit v0.9.0.2-2-gbebe +From fe34006908f1ff99ada34d52c06fd80197e452ec Mon Sep 17 00:00:00 2001 +From: Vinson Lee <[email protected]> +Date: Wed, 14 Mar 2012 05:40:52 +0000 +Subject: gallivm: Fix createOProfileJITEventListener namespace with llvm-3.1. + +llvm-3.1svn r152620 refactored the OProfile profiling code. +createOProfileJITEventListener was moved from the llvm namespace to the +llvm::JITEventListener namespace. + +Signed-off-by: Vinson Lee <[email protected]> +Reviewed-by: Brian Paul <[email protected]> +--- +(limited to 'src/gallium/auxiliary/gallivm/lp_bld_misc.cpp') + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } + + +-- +cgit v0.9.0.2-2-gbebe +From 1633dcd890d97bd5e4d125d57f2f529f04d14477 Mon Sep 17 00:00:00 2001 +From: Vinson Lee <[email protected]> +Date: Tue, 06 Mar 2012 06:00:40 +0000 +Subject: gallivm: Pass in a MCRegisterInfo to MCInstPrinter on llvm-3.1. + +llvm-3.1svn r152043 changes createMCInstPrinter to take an additional +MCRegisterInfo argument. + +Signed-off-by: Vinson Lee <[email protected]> +Reviewed-by: Brian Paul <[email protected]> +--- +(limited to 'src/gallium/auxiliary/gallivm/lp_bld_debug.cpp') + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index 11209da..b6849cb 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -243,7 +243,18 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +-- +cgit v0.9.0.2-2-gbebe +From 4f513002f65c629576252b34efedf3c8c4531dfd Mon Sep 17 00:00:00 2001 +From: Vinson Lee <[email protected]> +Date: Tue, 03 Apr 2012 05:14:15 +0000 +Subject: gallivm: Pass in a MCInstrInfo to createMCInstPrinter on llvm-3.1. + +llvm-3.1svn r153860 makes MCInstrInfo available to the MCInstPrinter. + +Signed-off-by: Vinson Lee <[email protected]> +Reviewed-by: Brian Paul <[email protected]> +--- +(limited to 'src/gallium/auxiliary/gallivm/lp_bld_debug.cpp') + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index c5afff0..9cf2094 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -251,11 +251,17 @@ lp_disassemble(const void* func) + debug_printf("error: no register info for target %s\n", Triple.c_str()); + return; + } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } + #endif + + #if HAVE_LLVM >= 0x0301 + OwningPtr<MCInstPrinter> Printer( +- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI)); ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); + #elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); +-- +cgit v0.9.0.2-2-gbebe ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/Mesa/Mesa.spec?r1=1.325&r2=1.326 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
