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

[Laurent Carlier]

    Date: Friday, September 5, 2014 @ 22:00:58
  Author: lcarlier
Revision: 118428

upgpkg: lib32-mesa 10.2.6-2

llvm-3.5.0 rebuild

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

--------------+
 PKGBUILD     |   14 +++++++++++---
 llvm35.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-05 19:43:26 UTC (rev 118427)
+++ PKGBUILD	2014-09-05 20:00:58 UTC (rev 118428)
@@ -5,7 +5,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl')
 pkgver=10.2.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -12,10 +12,18 @@
              'lib32-libvdpau' 'lib32-wayland')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
+        llvm35.patch)
 sha256sums=('193314d2adba98e43697d726739ac46b4299aae324fa1821aa226890c28ac806'
-            SKIP)
+            SKIP
+            'd3d433564cd21da8aa56a9ceccee6122d5991cae2bd1924173359f13bd38bd6f')
 
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  patch -Np1 -i ../llvm35.patch
+}
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"

Added: llvm35.patch
===================================================================
--- llvm35.patch	                        (rev 0)
+++ llvm35.patch	2014-09-05 20:00:58 UTC (rev 118428)
@@ -0,0 +1,26 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awatry at gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awatry at gmail.com>
+Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index df26883..413a0c2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -51,7 +51,9 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #include <llvm/MC/MCRegisterInfo.h>
+ 
+-#if HAVE_LLVM >= 0x0303
++#if HAVE_LLVM >= 0x0305
++#define OwningPtr std::unique_ptr
++#elif HAVE_LLVM >= 0x0303
+ #include <llvm/ADT/OwningPtr.h>
+ #endif
+ 
+-- 
+cgit v0.10.2
+