From ecefc239af91249a6f8d5a159c3c3723bd4d1d0073007b5ea931ca26b775bb8f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 12 Sep 2011 08:22:20 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/Mesa revision 131.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=6b20a730cb530f73b4f40eae854ffb11 --- Mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesa.spec b/Mesa.spec index 0cf8f60..9f55188 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -20,7 +20,7 @@ %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 From 6724c881ecd1068c52b1bbfa03499a0d9fd12d6b16ceeb165c342ae9cbc4dc03 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 12 Sep 2011 14:54:55 +0000 Subject: [PATCH 2/4] Accepting request 81907 from home:namtrac:bugfix - Fix build with Factory too OBS-URL: https://build.opensuse.org/request/show/81907 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=174 --- FIX_BUILD_WITH_LLVM.patch => Mesa-llvm-3.0.patch | 0 Mesa.changes | 5 +++++ Mesa.spec | 7 +------ 3 files changed, 6 insertions(+), 6 deletions(-) rename FIX_BUILD_WITH_LLVM.patch => Mesa-llvm-3.0.patch (100%) diff --git a/FIX_BUILD_WITH_LLVM.patch b/Mesa-llvm-3.0.patch similarity index 100% rename from FIX_BUILD_WITH_LLVM.patch rename to Mesa-llvm-3.0.patch diff --git a/Mesa.changes b/Mesa.changes index 1049fdd..5018d3c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 12 10:47:17 UTC 2011 - idonmez@suse.com + +- Fix build with Factory too + ------------------------------------------------------------------- Fri Sep 9 15:08:02 UTC 2011 - vljn@ovi.com diff --git a/Mesa.spec b/Mesa.spec index 9f55188..6eaf3b0 100644 --- a/Mesa.spec +++ b/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: FIX_BUILD_WITH_LLVM.patch -%endif +Patch15: Mesa-llvm-3.0.patch 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 From 0f6d2289e892768fd825ecf8c91eab8ca3645c863e0cb182932c772ebc45f4d5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 12 Sep 2011 23:49:39 +0000 Subject: [PATCH 3/4] - revert previous change since it actually *broke* the build with Factory OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=175 --- Mesa-llvm-3.0.patch => FIX_BUILD_WITH_LLVM.patch | 0 MD5SUMS | 12 ++++++++++++ MD5SUMS.meta | 1 + Mesa.changes | 6 ++++++ Mesa.spec | 7 ++++++- 5 files changed, 25 insertions(+), 1 deletion(-) rename Mesa-llvm-3.0.patch => FIX_BUILD_WITH_LLVM.patch (100%) create mode 100644 MD5SUMS create mode 100644 MD5SUMS.meta diff --git a/Mesa-llvm-3.0.patch b/FIX_BUILD_WITH_LLVM.patch similarity index 100% rename from Mesa-llvm-3.0.patch rename to FIX_BUILD_WITH_LLVM.patch diff --git a/MD5SUMS b/MD5SUMS new file mode 100644 index 0000000..63a3ab0 --- /dev/null +++ b/MD5SUMS @@ -0,0 +1,12 @@ +9c35c775244e027c015611a07970d357 FIX_BUILD_WITH_LLVM.patch +8b8113cbe6c63b9a41973695a66aee7d Mesa.changes +e07b0af8bba834e3fe174a47cb07005e Mesa.spec +d2b5955158c82bd0a89964bdc39d4559 MesaLib-7.11.tar.bz2 +3717202fd4ed99c42c249227e1891392 README.updates +847e07bcbb3daf315f2ab15f024364ad U_Mesa-7.11-llvm3.patch +8d5ab257641658c8d946419b3bb72d34 U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff +2dc57a7c3922d06bb47a9126ba2462ac baselibs.conf +b3619b22abafe591ac7cf7cb0a6f04e0 drirc +799d2da86deb7f425cfadc0b98d889c9 manual-pages.tar.bz2 +8fa902a3dde774c59c8fd70fcbdcba4c u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch +36b62abe308bbc0ac033db3ae1adf468 u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch diff --git a/MD5SUMS.meta b/MD5SUMS.meta new file mode 100644 index 0000000..017b40e --- /dev/null +++ b/MD5SUMS.meta @@ -0,0 +1 @@ +31bc1fffbedd8f16c87f3d0b8134c0e2 MD5SUMS diff --git a/Mesa.changes b/Mesa.changes index 5018d3c..4ee9f7a 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 12 23:48:34 UTC 2011 - sndirsch@suse.com + +- revert previous change since it actually *broke* the build with + Factory + ------------------------------------------------------------------- Mon Sep 12 10:47:17 UTC 2011 - idonmez@suse.com diff --git a/Mesa.spec b/Mesa.spec index 6eaf3b0..9f55188 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -53,7 +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 -Patch15: Mesa-llvm-3.0.patch +%if 0%{?suse_version} <= 1140 +Patch15: FIX_BUILD_WITH_LLVM.patch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -124,7 +126,10 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch11 -p1 %patch13 -p0 %patch14 -p1 + +%if 0%{?suse_version} <= 1140 %patch15 -p1 +%endif %build From fb03699413c70898fcc2a0ff13455ccae377124f44f49f8a9de450061c34ed9c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 Sep 2011 06:53:21 +0000 Subject: [PATCH 4/4] 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 | 44 ------------------ Mesa-llvm-3.0.patch | 95 +++++++++++++++++++++++++++++++++++++++ Mesa.changes | 10 +++++ Mesa.spec | 7 +-- 4 files changed, 106 insertions(+), 50 deletions(-) delete mode 100644 FIX_BUILD_WITH_LLVM.patch create mode 100644 Mesa-llvm-3.0.patch diff --git a/FIX_BUILD_WITH_LLVM.patch b/FIX_BUILD_WITH_LLVM.patch deleted file mode 100644 index daae947..0000000 --- a/FIX_BUILD_WITH_LLVM.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4a468de2d78fc5a9e6de40a9dae09669ec556fc5 Mon Sep 17 00:00:00 2001 -From: Tobias Droste -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 ---- -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 - #include --#include --#include - #include - #include - #include - -+#if HAVE_LLVM >= 0x0300 -+#include -+#include -+#else /* HAVE_LLVM < 0x0300 */ -+#include -+#include -+#endif /* HAVE_LLVM < 0x0300 */ -+ - #if HAVE_LLVM >= 0x0209 - #include --#else -+#else /* HAVE_LLVM < 0x0209 */ - #include --#endif -+#endif /* HAVE_LLVM < 0x0209 */ - - #if HAVE_LLVM >= 0x0207 - #include --- -cgit v0.9.0.2-2-gbebe diff --git a/Mesa-llvm-3.0.patch b/Mesa-llvm-3.0.patch new file mode 100644 index 0000000..71ceda2 --- /dev/null +++ b/Mesa-llvm-3.0.patch @@ -0,0 +1,95 @@ +From 4a468de2d78fc5a9e6de40a9dae09669ec556fc5 Mon Sep 17 00:00:00 2001 +From: Tobias Droste +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 +--- +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 + #include +-#include +-#include + #include + #include + #include + ++#if HAVE_LLVM >= 0x0300 ++#include ++#include ++#else /* HAVE_LLVM < 0x0300 */ ++#include ++#include ++#endif /* HAVE_LLVM < 0x0300 */ ++ + #if HAVE_LLVM >= 0x0209 + #include +-#else ++#else /* HAVE_LLVM < 0x0209 */ + #include +-#endif ++#endif /* HAVE_LLVM < 0x0209 */ + + #if HAVE_LLVM >= 0x0207 + #include +-- +cgit v0.9.0.2-2-gbebe +From 973221968117c50b141b700350d2e83befff4fce Mon Sep 17 00:00:00 2001 +From: ojab +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 DisAsm(T->createMCDisassembler(*STI)); ++#else + OwningPtr 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 Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); ++#elif HAVE_LLVM >= 0x0208 + OwningPtr Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo)); + #else +-- +1.7.6 + diff --git a/Mesa.changes b/Mesa.changes index 4ee9f7a..c7e89ab 100644 --- a/Mesa.changes +++ b/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 diff --git a/Mesa.spec b/Mesa.spec index 9f55188..6eaf3b0 100644 --- a/Mesa.spec +++ b/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: FIX_BUILD_WITH_LLVM.patch -%endif +Patch15: Mesa-llvm-3.0.patch 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