[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD llvm6.patch)

[Evangelos Foutras]

    Date: Monday, March 19, 2018 @ 21:58:20
  Author: foutrelis
Revision: 309173

upgpkg: lib32-mesa 17.3.6-2

LLVM 6 rebuild.

Added:
  lib32-mesa/trunk/llvm6.patch
Modified:
  lib32-mesa/trunk/PKGBUILD

-------------+
 PKGBUILD    |    8 ++++--
 llvm6.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-19 17:49:36 UTC (rev 309172)
+++ PKGBUILD	2018-03-19 21:58:20 UTC (rev 309173)
@@ -6,7 +6,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
 pkgver=17.3.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
@@ -14,11 +14,13 @@
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-	LICENSE
+        LICENSE
+        llvm6.patch
         0001-glvnd-fix-gl-dot-pc.patch)
 sha256sums=('e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            '768a99785ce782e17b34e7282de47f5332c92b3d2dda90c3aec0621aa131dbe7'
             '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty at igalia.com>"
@@ -27,6 +29,8 @@
 prepare() {
   cd ${srcdir}/mesa-${pkgver}
 
+  patch -Np1 -i ../llvm6.patch
+
   # glvnd support patches - from Fedora
   # non-upstreamed ones
   patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch

Added: llvm6.patch
===================================================================
--- llvm6.patch	                        (rev 0)
+++ llvm6.patch	2018-03-19 21:58:20 UTC (rev 309173)
@@ -0,0 +1,74 @@
+From 5cb505b3517324b2f432fb3d538d925bbad88c0a Mon Sep 17 00:00:00 2001
+From: Tobias Droste <tdroste at gmx.de>
+Date: Mon, 6 Nov 2017 22:09:50 +0100
+Subject: gallivm: Use new LLVM fast-math-flags API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+LLVM 6 changed the API on the fast-math-flags:
+https://reviews.llvm.org/rL317488
+
+NOTE: This also enables the new flag 'ApproxFunc' to allow for
+approximations for library functions (sin, cos, ...). I'm not completly
+convinced, that this is something mesa should do.
+
+Signed-off-by: Tobias Droste <tdroste at gmx.de>
+Reviewed-by: Marek Olšák <marek.olsak at amd.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index d988910..1319407 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -830,7 +830,11 @@ lp_create_builder(LLVMContextRef ctx, enum lp_float_mode float_mode)
+       llvm::unwrap(builder)->setFastMathFlags(flags);
+       break;
+    case LP_FLOAT_MODE_UNSAFE_FP_MATH:
++#if HAVE_LLVM >= 0x0600
++      flags.setFast();
++#else
+       flags.setUnsafeAlgebra();
++#endif
+       llvm::unwrap(builder)->setFastMathFlags(flags);
+       break;
+    }
+-- 
+cgit v1.1
+
+From 98b6a6860c97cec1323573f4ca47d966a43da3ea Mon Sep 17 00:00:00 2001
+From: Tim Rowley <timothy.o.rowley at intel.com>
+Date: Tue, 2 Jan 2018 10:48:21 -0600
+Subject: swr/rast: fix MemoryBuffer build break for llvm-6
+
+LLVM api change.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104381
+Tested-by: Laurent Carlier <lordheavym at gmail.com>
+Reviewed-By: Bruce Cherniak <bruce.cherniak at intel.com>
+(cherry picked from commit ad218754c79e0af61d5ba225a4b195cb55c2cac9)
+---
+ src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+index 83e70b1..98fcaa1 100644
+--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
++++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+@@ -498,7 +498,11 @@ std::unique_ptr<llvm::MemoryBuffer> JitCache::getObject(const llvm::Module* M)
+             break;
+         }
+ 
++#if LLVM_VERSION_MAJOR < 6
+         pBuf = llvm::MemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
++#else
++        pBuf = llvm::WritableMemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
++#endif
+         if (!fread(const_cast<char*>(pBuf->getBufferStart()), header.GetBufferSize(), 1, fpIn))
+         {
+             pBuf = nullptr;
+-- 
+cgit v1.1
+