Accepting request 329651 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/329651
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=249

Mesa.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Sep  7 08:33:46 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 10.6.6:
+  * This release includes patches for mesa core, i965 (regression
+    fixes), r600 (assertions and crash fixes in the sb backend),
+    radeonsi (workaround for GPU hang in Unigine Heaven) and
+    nouveau (piglit tests).
+- Replace libXvMC-devel and libexpat-devel for pkgconfig(xvmc) and
+  pkgconfig(expat) BuildRequires.
+
+-------------------------------------------------------------------
+Mon Sep  7 03:45:34 UTC 2015 - alarrosa@suse.com
+
+- Add U_mesa-llvm37-rename-r600-to-amdgpu.patch to fix build with llvm 3.7
+  due to rename of llvm target R600 to AMDGPU 
+
+-------------------------------------------------------------------
+Sat Sep  5 11:45:32 UTC 2015 - idonmez@suse.com
+
+- Add U_mesa-llvm37.patch to fix build with llvm 3.7
+
 -------------------------------------------------------------------
 Sat Aug 22 14:17:01 UTC 2015 - zaitor@opensuse.org
 

Mesa.spec

@@ -18,7 +18,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 10.6.5
+%define _version 10.6.6
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
 %define gallium_loader 1
 %else
@@ -37,7 +37,7 @@
 %define with_nine 1
 %endif
 Name:           Mesa
-Version:        10.6.5
+Version:        10.6.6
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -56,6 +56,10 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
+# Upstream commit to fix build with llvm 3.7
+Patch16:        U_mesa-llvm37.patch   
+# Upstream commit to fix build with llvm 3.7
+Patch17:        U_mesa-llvm37-rename-r600-to-amdgpu.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -63,8 +67,6 @@ BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  imake
-BuildRequires:  libXvMC-devel
-BuildRequires:  libexpat-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python-base
@@ -72,6 +74,7 @@ BuildRequires:  python-mako
 BuildRequires:  python-xml
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(dri3proto)
+BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(libdrm) >= 2.4.38
 BuildRequires:  pkgconfig(libdrm_nouveau) >= 2.4.41
@@ -91,6 +94,7 @@ BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xshmfence)
+BuildRequires:  pkgconfig(xvmc)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(zlib)
 Provides:       Mesa7 = %{version}
@@ -515,6 +519,8 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 # required for building against wayland of openSUSE 13.1
 %patch0 -p1
 %endif
+%patch16 -p1
+%patch17 -p1
 ### disabled, but not dropped yet; these still need investigation in
 ### order to figure out whether the issue is still reproducable and
 ### hence a fix is required

U_mesa-llvm37-rename-r600-to-amdgpu.patch

@@ -0,0 +1,71 @@
+From patchwork Fri Jun 12 00:36:45 2015
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [Mesa-dev] radeon/llvm: Handle LLVM backend rename from R600 to AMDGPU
+From: Tom Stellard <thomas.stellard@amd.com>
+X-Patchwork-Id: 51706
+Message-Id: <1434069405-11033-1-git-send-email-thomas.stellard@amd.com>
+To: <mesa-dev@lists.freedesktop.org>
+Cc: Tom Stellard <thomas.stellard@amd.com>
+Date: Fri, 12 Jun 2015 00:36:45 +0000
+
+---
+ configure.ac                                  | 13 ++++++++-----
+ src/gallium/drivers/radeon/radeon_llvm_emit.c |  8 ++++++++
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+Reviewed-by: Marek Olšák <marek.olsak@amd.com>
+
+
+diff --git a/configure.ac b/configure.ac
+index d32aa24..eda8d23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2048,16 +2048,19 @@ require_egl_drm() {
+ }
+ 
+ radeon_llvm_check() {
++    if test ${LLVM_VERSION_INT} -lt 307; then
++        amdgpu_llvm_target_name='r600'
++    else
++        amdgpu_llvm_target_name='amdgpu'
++    fi
+     if test "x$enable_gallium_llvm" != "xyes"; then
+         AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
+     fi
+     llvm_check_version_for "3" "4" "2" $1 
+-    if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then
+-        AC_MSG_ERROR([LLVM R600 Target not enabled.  You can enable it when building the LLVM
+-                      sources with the --enable-experimental-targets=R600
+-                      configure flag])
++    if test true && $LLVM_CONFIG --targets-built | grep -iqvw $amdgpu_llvm_target_name ; then
++        AC_MSG_ERROR([LLVM $amdgpu_llvm_target_name not enabled in your LLVM build.])
+     fi
+-    LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo"
++    LLVM_COMPONENTS="${LLVM_COMPONENTS} $amdgpu_llvm_target_name bitreader ipo"
+     NEED_RADEON_LLVM=yes
+     if test "x$have_libelf" != xyes; then
+        AC_MSG_ERROR([$1 requires libelf when using llvm])
+diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c
+index 624077c..25580b6 100644
+--- a/src/gallium/drivers/radeon/radeon_llvm_emit.c
++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c
+@@ -86,10 +86,18 @@ static void init_r600_target()
+ {
+ 	static unsigned initialized = 0;
+ 	if (!initialized) {
++#if HAVE_LLVM < 0x0307
+ 		LLVMInitializeR600TargetInfo();
+ 		LLVMInitializeR600Target();
+ 		LLVMInitializeR600TargetMC();
+ 		LLVMInitializeR600AsmPrinter();
++#else
++		LLVMInitializeAMDGPUTargetInfo();
++		LLVMInitializeAMDGPUTarget();
++		LLVMInitializeAMDGPUTargetMC();
++		LLVMInitializeAMDGPUAsmPrinter();
++
++#endif
+ 		initialized = 1;
+ 	}
+ }

U_mesa-llvm37.patch

@@ -0,0 +1,45 @@
+From 147ffd48166d851341cadd12de98895f32ec25a2 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Tue, 26 May 2015 22:18:28 -0700
+Subject: gallivm: Do not use NoFramePointerElim with LLVM 3.7.
+
+TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244
+"Remove NoFramePointerElim and NoFramePointerElimOverride from
+TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC."
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index be3e834..76c302f 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -277,8 +277,10 @@ disassemble(const void* func, llvm::raw_ostream & Out)
+    options.StackAlignmentOverride = 4;
+ #endif
+ #if defined(DEBUG) || defined(PROFILE)
++#if HAVE_LLVM < 0x0307
+    options.NoFramePointerElim = true;
+ #endif
++#endif
+    OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options));
+ 
+    /*
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 5e8a634..ffed9e6 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -439,8 +439,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+ #if HAVE_LLVM < 0x0304
+    options.NoFramePointerElimNonLeaf = true;
+ #endif
++#if HAVE_LLVM < 0x0307
+    options.NoFramePointerElim = true;
+ #endif
++#endif
+ 
+    builder.setEngineKind(EngineKind::JIT)
+           .setErrorStr(&Error)
+-- 
+cgit v0.10.2
+

mesa-10.6.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f
-size 7037400

mesa-10.6.6.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778
+size 7040744