Accepting request 288634 from X11:XOrg

1

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

Mesa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  2 19:27:19 UTC 2015 - idonmez@suse.com
+
+- Add u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch to
+  fix build with llvm 3.6 (fdo#86958)
+
 -------------------------------------------------------------------
 Tue Feb 24 16:08:49 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
 

Mesa.spec

@@ -54,6 +54,8 @@ 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
+# Fix build with llvm 3.6 fdo#86958
+Patch16:        u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 ###
+%patch16 -p1
 
 %build
 %if 0%{?suse_version} >= 1310

u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch

@@ -0,0 +1,29 @@
+From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
+Date: Wed, 3 Dec 2014 07:48:26 +0000
+Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
+
+Trivial.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe3c754..5210acc 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+        MM = new ShaderMemoryManager(JMM);
+        *OutCode = MM->getGeneratedCode();
+ 
++#if HAVE_LLVM >= 0x0306
++       builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM));
++#else
+        builder.setMCJITMemoryManager(MM);
+ #endif
++#endif
+    } else {
+ #if HAVE_LLVM < 0x0306
+        BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
+-- 
+cgit v0.10.2
+