diff options
| author | Matt Housh <jaeger@crux.nu> | 2015-03-18 21:13:33 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2015-03-18 21:13:33 -0500 |
| commit | 285a626a9ada3a3243d3965d0a96fc0eaedd02b3 (patch) | |
| tree | 93414897040ee17685bc734146457506f0b85316 | |
| parent | 0ed0eb7e0b43447f2cf92d6755a87e5d6cff2383 (diff) | |
| download | xorg-285a626a9ada3a3243d3965d0a96fc0eaedd02b3.tar.gz xorg-285a626a9ada3a3243d3965d0a96fc0eaedd02b3.tar.xz | |
mesa3d: updated to version 10.5.1, please note new dependency mako
| -rw-r--r-- | mesa3d/.md5sum | 3 | ||||
| -rw-r--r-- | mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch | 33 | ||||
| -rw-r--r-- | mesa3d/Pkgfile | 12 |
3 files changed, 6 insertions, 42 deletions
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index b44dc9c1..39131029 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1,2 +1 @@ -89a9862f747127feb5cc06ed86ebd2be 0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch -b4f5e94d5d1fd2e4b1f9fd34d3d28595 MesaLib-10.4.6.tar.bz2 +203dba1fb6b503802fa6625181b26d31 mesa-10.5.1.tar.xz diff --git a/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch b/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch deleted file mode 100644 index 7184c06a..00000000 --- a/mesa3d/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 e79547ea..ab4bc7ca 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -1,18 +1,16 @@ # 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 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-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxt xorg-libxvmc xorg-libxxf86vm xorg-makedepend xorg-presentproto mako name=mesa3d -version=10.4.6 +version=10.5.1 release=1 -source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2 \ - 0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch) +source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz) build() { - cd Mesa-$version - patch -p1 -i $SRC/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch - autoreconf --install --symlink + cd mesa-$version + autoreconf --force --install --symlink ./configure \ --prefix=/usr \ |