Date: Wednesday, September 20, 2017 @ 13:17:36 Author: lcarlier Revision: 305917
upgpkg: mesa 17.2.1-2 Add patch to enable swr with llvm-5.0.0 Added: mesa/trunk/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch Modified: mesa/trunk/PKGBUILD ---------------------------------------------------------------+ PKGBUILD | 12 +++--- swr-rast-remove-llvm-fence-atomics-from-generated-files.patch | 19 ++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-20 12:38:10 UTC (rev 305916) +++ PKGBUILD 2017-09-20 13:17:36 UTC (rev 305917) @@ -5,7 +5,7 @@ pkgbase=mesa pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') pkgver=17.2.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' @@ -15,12 +15,14 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE 0002-glvnd-fix-gl-dot-pc.patch - swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch) + swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch + swr-rast-remove-llvm-fence-atomics-from-generated-files.patch) sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' - '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b') + '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b' + 'a747e0046eab7bb9c73444549c9c63d078b11b756d2294ba9c7ee0612caf62db') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <ta...@igalia.com> validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" @@ -33,8 +35,8 @@ patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch # swr driver - # but currently broken with llvm-5.0.0 https://bugs.freedesktop.org/show_bug.cgi?id=102847 patch -Np1 -i ../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch + patch -Np1 -i ../swr-rast-remove-llvm-fence-atomics-from-generated-files.patch autoreconf -fiv } @@ -45,7 +47,7 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --with-platforms=x11,drm,wayland \ --with-vulkan-drivers=intel,radeon \ Added: swr-rast-remove-llvm-fence-atomics-from-generated-files.patch =================================================================== --- swr-rast-remove-llvm-fence-atomics-from-generated-files.patch (rev 0) +++ swr-rast-remove-llvm-fence-atomics-from-generated-files.patch 2017-09-20 13:17:36 UTC (rev 305917) @@ -0,0 +1,19 @@ +diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py +index 025d38a..ce892a9 100644 +--- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py ++++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py +@@ -140,6 +140,14 @@ def parse_ir_builder(input_file): + + ignore = False + ++ # The following functions need to be ignored in openswr. ++ # API change in llvm-5.0 breaks baked autogen files ++ if ( ++ (func_name == 'CreateFence' or ++ func_name == 'CreateAtomicCmpXchg' or ++ func_name == 'CreateAtomicRMW')): ++ ignore = True ++ + # The following functions need to be ignored. + if (func_name == 'CreateInsertNUWNSWBinOp' or + func_name == 'CreateMaskedIntrinsic' or