commit ec54713b0ad95e5039a8d244503a89250a82d7da Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Mar 7 20:17:19 2015 +1100 Revert "[notify] mesa3d-32: 10.4.5 -> 10.5.0 new dependency mako" This reverts commit 2ee93998a74c593eb0576725d191b5d58a3eb6ec. diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index f6d62ec..3ab3e59 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1,2 @@ -133c5264a0c81d23168a65435ad23ede mesa-10.5.0.tar.xz +89a9862f747127feb5cc06ed86ebd2be 0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch +fd44bf89d48d1744591d9dbe0ce1d54e MesaLib-10.4.5.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 895ba01..01b0ae5 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -1,17 +1,18 @@ # Description: Mesa 3D Graphics Library # URL: http://www.mesa3d.org # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: elfutils expat libdrm libvdpau libxml2-python llvm mako talloc xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend xorg-presentproto +# Depends on: elfutils expat libdrm libvdpau libxml2-python llvm talloc xorg-dri2proto xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend xorg-presentproto name=mesa3d -version=10.5.0 -release=1 -source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz) +version=10.4.5 +release=2 +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 - - autoreconf --install --symlink --force + cd Mesa-$version + patch -p1 -i $SRC/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch + autoreconf --install --symlink ./configure \ --prefix=/usr \