From 1212c75b97fc8135ee708cd991f720cf13ad30d4dfdf3545d0061cf5c62ce665 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 5 Sep 2011 10:01:12 +0000 Subject: [PATCH 1/3] - Update to Mesa 7.11 final OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=170 --- Mesa.changes | 5 +++++ Mesa.spec | 2 +- MesaLib-7.11-rc3.tar.bz2 | 3 --- MesaLib-7.11.tar.bz2 | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 MesaLib-7.11-rc3.tar.bz2 create mode 100644 MesaLib-7.11.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index 87234d0..1fb7e1e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 4 21:00:43 UTC 2011 - vljn@ovi.com + +- Update to Mesa 7.11 final + ------------------------------------------------------------------- Sun Sep 4 12:34:37 CEST 2011 - meissner@suse.de diff --git a/Mesa.spec b/Mesa.spec index 76aa9fe..0fee0f7 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -17,7 +17,7 @@ # norootforbuild -%define _version 7.11-rc3 +%define _version 7.11 Version: 7.11 Release: 1 diff --git a/MesaLib-7.11-rc3.tar.bz2 b/MesaLib-7.11-rc3.tar.bz2 deleted file mode 100644 index 8d74957..0000000 --- a/MesaLib-7.11-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f5649668b4810f4be23412f9b5bfeb98c127d411cf999adb1a827f95d539ce9 -size 6633330 diff --git a/MesaLib-7.11.tar.bz2 b/MesaLib-7.11.tar.bz2 new file mode 100644 index 0000000..f71fdc3 --- /dev/null +++ b/MesaLib-7.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d8dd5f16536a400e44f860f52e49e79e2476b648e06f13d8ca72449c7c0bccf +size 6664313 From ed50df71c14c578c2099c1c5e61b3b9021ac48f2d7450a9086c5463e24500dad Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Sep 2011 12:53:53 +0000 Subject: [PATCH 2/3] Updating link to change in openSUSE:Factory/Mesa revision 129.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=fccb03a6ef8f96db008061322b813134 --- Mesa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mesa.spec b/Mesa.spec index 0fee0f7..1eae55d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -20,13 +20,13 @@ %define _version 7.11 Version: 7.11 -Release: 1 +Release: 3 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel BuildRequires: bison fdupes flex libtalloc-devel libxml2-python %ifarch %ix86 x86_64 -BuildRequires: llvm-devel +BuildRequires: llvm-devel %endif Url: http://www.mesa3d.org License: MIT License (or similar) From 9166adff02e7a81f9bac794d5a1386e20f7ddc15bf7bfdfd7e9e38b8b14d049e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 9 Sep 2011 15:37:55 +0000 Subject: [PATCH 3/3] Accepting request 81704 from home:vlj:branches:X11:XOrg - Fix openSUSE 11.3 11.4 build OBS-URL: https://build.opensuse.org/request/show/81704 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=172 --- FIX_BUILD_WITH_LLVM.patch | 44 +++++++++++++++++++++++++++++++++++++++ Mesa.changes | 5 +++++ Mesa.spec | 7 +++++++ 3 files changed, 56 insertions(+) create mode 100644 FIX_BUILD_WITH_LLVM.patch diff --git a/FIX_BUILD_WITH_LLVM.patch b/FIX_BUILD_WITH_LLVM.patch new file mode 100644 index 0000000..daae947 --- /dev/null +++ b/FIX_BUILD_WITH_LLVM.patch @@ -0,0 +1,44 @@ +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.changes b/Mesa.changes index 1fb7e1e..1049fdd 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 9 15:08:02 UTC 2011 - vljn@ovi.com + +- Fix openSUSE 11.3 11.4 build + ------------------------------------------------------------------- Sun Sep 4 21:00:43 UTC 2011 - vljn@ovi.com diff --git a/Mesa.spec b/Mesa.spec index 1eae55d..0cf8f60 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -53,6 +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 +%if 0%{?suse_version} <= 1140 +Patch15: FIX_BUILD_WITH_LLVM.patch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -124,6 +127,10 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch13 -p0 %patch14 -p1 +%if 0%{?suse_version} <= 1140 +%patch15 -p1 +%endif + %build %install