Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Mon Sep 12 10:22:17 CEST 2011.
-------- --- Mesa/Mesa.changes 2011-09-04 12:35:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2011-09-09 17:08:18.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Sep 9 15:08:02 UTC 2011 - [email protected] + +- Fix openSUSE 11.3 11.4 build + +------------------------------------------------------------------- +Sun Sep 4 21:00:43 UTC 2011 - [email protected] + +- Update to Mesa 7.11 final + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.11-rc3.tar.bz2 New: ---- FIX_BUILD_WITH_LLVM.patch MesaLib-7.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.6jYGmG/_old 2011-09-12 10:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.6jYGmG/_new 2011-09-12 10:22:13.000000000 +0200 @@ -17,10 +17,10 @@ # norootforbuild -%define _version 7.11-rc3 +%define _version 7.11 Version: 7.11 -Release: 3 +Release: 5 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -53,6 +53,9 @@ # 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 @@ %patch13 -p0 %patch14 -p1 +%if 0%{?suse_version} <= 1140 +%patch15 -p1 +%endif + %build %install ++++++ FIX_BUILD_WITH_LLVM.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 ++++++ MesaLib-7.11-rc3.tar.bz2 -> MesaLib-7.11.tar.bz2 ++++++ Mesa/MesaLib-7.11-rc3.tar.bz2 /mounts/work_src_done/STABLE/Mesa/MesaLib-7.11.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
