From e169eb55aadca11cdd90264a99e065eb9a068439 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Mon, 9 Mar 2015 10:19:31 +0100
Subject: [PATCH] mesa3d: updated to 10.4.6

---
 mesa3d/.md5sum                                |  3 +-
 ...or-RTDyldMemoryManager-becoming-an-u.patch | 33 +++++++++++++++++++
 mesa3d/Pkgfile                                | 12 ++++---
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch

diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index f7a692c..b44dc9c 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1 +1,2 @@
-fd44bf89d48d1744591d9dbe0ce1d54e  MesaLib-10.4.5.tar.bz2
+89a9862f747127feb5cc06ed86ebd2be  0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
+b4f5e94d5d1fd2e4b1f9fd34d3d28595  MesaLib-10.4.6.tar.bz2
diff --git a/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch b/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
new file mode 100644
index 0000000..7184c06
--- /dev/null
+++ b/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
@@ -0,0 +1,33 @@
+From 89f4202c6b0477eba0ec62340b8882a4a5fa6949 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: [PATCH 196/196] gallivm: Update for RTDyldMemoryManager becoming an
+ unique_ptr.
+
+Trivial.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
+---
+ 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 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);
+-- 
+2.2.1
+
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index 23e0d39..084edb6 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -2,17 +2,19 @@
 # URL: http://www.mesa3d.org
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu
-# Depends on: expat libdrm libxml2-python talloc xorg-dri2proto xorg-glproto xorg-libxdamage xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend
+# Depends on: elfutils expat libdrm libvdpau libxml2-python llvm talloc xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend xorg-presentproto
 
 name=mesa3d
-version=10.4.5
-release=2
-source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
+version=10.4.6
+release=1
+source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2 \
+        0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch)
 
 build() {
   cd Mesa-$version
-
+  patch -p1 -i $SRC/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
   autoreconf --install --symlink
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-gallium-llvm \
-- 
2.26.2