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

[Evangelos Foutras]

    Date: Monday, March 19, 2018 @ 21:58:06
  Author: foutrelis
Revision: 319652

upgpkg: mesa 17.3.6-2

LLVM 6 rebuild.

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

-------------+
 PKGBUILD    |    6 +++-
 llvm6.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-19 19:28:54 UTC (rev 319651)
+++ PKGBUILD	2018-03-19 21:58:06 UTC (rev 319652)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgver=17.3.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -14,10 +14,12 @@
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
+        llvm6.patch
         0001-glvnd-fix-gl-dot-pc.patch)
 sha512sums=('5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f'
             'SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            '73d1383bddadf42cf808b4d09c49388279a9b2046ba3f2115fcc3ff2a501517067b9bf1e0d6c70f44a34ea29f8e680780e0480cc52c68c51f584dd21d871da3c'
             '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <tanty at igalia.com>
@@ -26,6 +28,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:06 UTC (rev 319652)
@@ -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
+