Date: Saturday, September 20, 2014 @ 23:14:22 Author: lcarlier Revision: 222523
upgpkg: mesa 10.3.0-2 update dependencies Modified: mesa/trunk/PKGBUILD Deleted: mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch mesa/trunk/llvm35.patch -----------------------------------------------------------------+ 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch | 33 ---- 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch | 77 ---------- PKGBUILD | 24 +-- llvm35.patch | 26 --- 4 files changed, 11 insertions(+), 149 deletions(-) Deleted: 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch =================================================================== --- 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch 2014-09-20 19:24:27 UTC (rev 222522) +++ 0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch 2014-09-20 21:14:22 UTC (rev 222523) @@ -1,33 +0,0 @@ -From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <[email protected]> -Date: Wed, 14 May 2014 12:55:50 +0100 -Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+. - -Fixed upstream. - -(cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e) ---- - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index d85adfb..45c985d 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -321,11 +321,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager()); - - ExecutionEngine *JIT; --#if 0 -+#if HAVE_LLVM >= 0x0302 - JIT = builder.create(); - #else - /* -- * Workaround http://llvm.org/bugs/show_bug.cgi?id=12833 -+ * Workaround http://llvm.org/PR12833 - */ - StringRef MArch = ""; - StringRef MCPU = ""; --- -2.1.0 - Deleted: 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch =================================================================== --- 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch 2014-09-20 19:24:27 UTC (rev 222522) +++ 0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch 2014-09-20 21:14:22 UTC (rev 222523) @@ -1,77 +0,0 @@ -From ebe30fd4d4a90219431b6947f233473b2cf518a5 Mon Sep 17 00:00:00 2001 -From: Roland Scheidegger <[email protected]> -Date: Thu, 19 Jun 2014 03:27:26 +0200 -Subject: [PATCH 2/2] gallivm: set mcpu when initializing llvm execution engine - -Previously llvm detected cpu features automatically when the execution engine -was created (based on host cpu). This is no longer the case, which meant llvm -was then not able to emit some of the intrinsics we used as we didn't specify -any sse attributes (only on avx supporting systems this was not a problem since -despite at least some llvm versions enabling it anyway we always set this -manually). So, instead of trying to figure out which MAttrs to set just set -MCPU. - -This fixes https://bugs.freedesktop.org/show_bug.cgi?id=77493. - -Reviewed-by: Jose Fonseca <[email protected]> -Tested-by: Vinson Lee <[email protected]> -(cherry picked from commit cad60420d5ea36a4b6fa2e6c91317f71423aa63e) ---- - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index 45c985d..395ac7b 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -59,6 +59,7 @@ - #include <llvm/ExecutionEngine/JITMemoryManager.h> - #endif - #include <llvm/Support/CommandLine.h> -+#include <llvm/Support/Host.h> - #include <llvm/Support/PrettyStackTrace.h> - - #if HAVE_LLVM >= 0x0300 -@@ -309,8 +310,8 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - /* - * AVX feature is not automatically detected from CPUID by the X86 target - * yet, because the old (yet default) JIT engine is not capable of -- * emitting the opcodes. But as we're using MCJIT here, it is safe to -- * add set this attribute. -+ * emitting the opcodes. On newer llvm versions it is and at least some -+ * versions (tested with 3.3) will emit avx opcodes without this anyway. - */ - MAttrs.push_back("+avx"); - if (util_cpu_caps.has_f16c) { -@@ -318,9 +319,28 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - } - builder.setMAttrs(MAttrs); - } -+ -+#if HAVE_LLVM >= 0x0305 -+ StringRef MCPU = llvm::sys::getHostCPUName(); -+ /* -+ * The cpu bits are no longer set automatically, so need to set mcpu manually. -+ * Note that the MAttrs set above will be sort of ignored (since we should -+ * not set any which would not be set by specifying the cpu anyway). -+ * It ought to be safe though since getHostCPUName() should include bits -+ * not only from the cpu but environment as well (for instance if it's safe -+ * to use avx instructions which need OS support). According to -+ * http://llvm.org/bugs/show_bug.cgi?id=19429 however if I understand this -+ * right it may be necessary to specify older cpu (or disable mattrs) though -+ * when not using MCJIT so no instructions are generated which the old JIT -+ * can't handle. Not entirely sure if we really need to do anything yet. -+ */ -+ builder.setMCPU(MCPU); -+#endif -+ - builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager()); - - ExecutionEngine *JIT; -+ - #if HAVE_LLVM >= 0x0302 - JIT = builder.create(); - #else --- -2.1.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-20 19:24:27 UTC (rev 222522) +++ PKGBUILD 2014-09-20 21:14:22 UTC (rev 222523) @@ -5,7 +5,7 @@ pkgbase=mesa pkgname=('opencl-mesa' 'mesa-dri' 'mesa-vdpau' 'mesa' 'mesa-libgl') pkgver=10.3.0 -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' @@ -63,15 +63,15 @@ package_opencl-mesa() { pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang') + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'libcl' 'libclc' 'clang') optdepends=('opencl-headers: headers necessary for OpenCL development') install -m755 -d ${pkgdir}/etc mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ - install -m755 -d ${pkgdir}/usr/lib + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/ - mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe ${pkgdir}/usr/lib/ + mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/ install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/" @@ -79,7 +79,7 @@ package_mesa-dri() { pkgdesc="Mesa DRI drivers" - depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn') + depends=('expat' 'libdrm' 'libtxc_dxtn') conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') @@ -96,6 +96,8 @@ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri # svga-dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri + # swrast + mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri install -m755 -d "${pkgdir}/usr/share/licenses/mesa-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-dri/" @@ -103,7 +105,7 @@ package_mesa-vdpau() { pkgdesc="Mesa VDPAU drivers" - depends=("mesa=${pkgver}") + depends=('libdrm' 'libx11' 'expat' 'elfutils') install -m755 -d ${pkgdir}/usr/lib mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib @@ -115,7 +117,7 @@ package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' - 'libomxil-bellagio' 'llvm-libs' 'libgl') + 'libomxil-bellagio' 'llvm-libs' 'mesa-dri') optdepends=('opengl-man-pages: for the OpenGL API man pages') provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') @@ -127,10 +129,6 @@ # FS#41337 #mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/ - # swrast - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri - mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ @@ -146,8 +144,8 @@ package_mesa-libgl() { pkgdesc="Mesa 3-D graphics library" - depends=("mesa=${pkgver}") - provides=("libgl=${pkgver}") + depends=('mesa') + provides=('libgl') replaces=('libgl') # See FS#26284 Deleted: llvm35.patch =================================================================== --- llvm35.patch 2014-09-20 19:24:27 UTC (rev 222522) +++ llvm35.patch 2014-09-20 21:14:22 UTC (rev 222523) @@ -1,26 +0,0 @@ -From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001 -From: Aaron Watry <[email protected]> -Date: Fri, 20 Jun 2014 19:13:30 -0500 -Subject: gallivm: Fix build after LLVM commit 211259 - -Signed-off-by: Aaron Watry <[email protected]> -Reviewed-by: Tom Stellard <[email protected]> - -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 -
