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

[Evangelos Foutras]

    Date: Friday, September 5, 2014 @ 19:31:06
  Author: foutrelis
Revision: 221022

upgpkg: mesa 10.2.6-2

LLVM 3.5 rebuild.

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

--------------+
 PKGBUILD     |   12 ++++++++++--
 llvm35.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-05 16:47:20 UTC (rev 221021)
+++ PKGBUILD	2014-09-05 17:31:06 UTC (rev 221022)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.2.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
@@ -13,11 +13,19 @@
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
+        llvm35.patch
         LICENSE)
 sha256sums=('193314d2adba98e43697d726739ac46b4299aae324fa1821aa226890c28ac806'
-            SKIP
+            'SKIP'
+            'd3d433564cd21da8aa56a9ceccee6122d5991cae2bd1924173359f13bd38bd6f'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
 
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  patch -Np1 -i ../llvm35.patch
+}
+
 build() {
   cd ${srcdir}/?esa-*
 

Added: llvm35.patch
===================================================================
--- llvm35.patch	                        (rev 0)
+++ llvm35.patch	2014-09-05 17:31:06 UTC (rev 221022)
@@ -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
+