[arch-commits] Commit in mesa/trunk (PKGBUILD remove-libpthread-stubs.patch)

[Laurent Carlier]

    Date: Friday, June 24, 2016 @ 07:17:25
  Author: lcarlier
Revision: 270550

prepare release 12.0.0

Added:
  mesa/trunk/remove-libpthread-stubs.patch
Modified:
  mesa/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   51 ++++++++++++++++++++++++++++++----------
 remove-libpthread-stubs.patch |   14 ++++++++++
 2 files changed, 53 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-24 06:17:19 UTC (rev 270549)
+++ PKGBUILD	2016-06-24 07:17:25 UTC (rev 270550)
@@ -3,9 +3,9 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgbase=mesa
-pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
-pkgver=11.2.2
-pkgrel=1
+pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
+pkgver=12.0.0
+pkgrel=0.1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -12,13 +12,24 @@
              'systemd' 'libomxil-bellagio' 'libgcrypt' 'libclc' 'clang')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
-        LICENSE)
-sha256sums=('40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4'
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}-rc4.tar.xz{,.sig}
+        LICENSE
+        remove-libpthread-stubs.patch)
+sha256sums=('a27f43f0031a3f1e77d767f7e3e019120ec5181a0a7c81fc0da7b611e8c4e91a'
             'SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
 
+prepare() {
+  cd ${srcdir}/?esa-*
+
+  # Now mesa checks for libpthread-stubs - so remove the check
+  patch -Np1 -i ../remove-libpthread-stubs.patch
+
+  autoreconf -fiv
+}
+
 build() {
   cd ${srcdir}/?esa-*
 
@@ -28,18 +39,19 @@
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-egl-platforms=x11,drm,wayland \
+    --with-vulkan-drivers=intel \
     --with-sha1=libgcrypt \
+    --enable-gallium-llvm \
     --enable-llvm-shared-libs \
+    --enable-shared-glapi \
     --enable-egl \
-    --enable-gbm \
-    --enable-gallium-llvm \
-    --enable-shared-glapi \
     --enable-glx \
     --enable-glx-tls \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-gbm \
     --enable-dri \
     --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
@@ -71,6 +83,21 @@
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
 }
 
+package_vulkan-intel() {
+  pkgdesc="Intel's Vulkan mesa driver"
+  depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb')
+  
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/
+
+  install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
+  mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
+}
+
 package_libva-mesa-driver() {
   pkgdesc="VA-API implementation for gallium"
   depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')

Added: remove-libpthread-stubs.patch
===================================================================
--- remove-libpthread-stubs.patch	                        (rev 0)
+++ remove-libpthread-stubs.patch	2016-06-24 07:17:25 UTC (rev 270550)
@@ -0,0 +1,14 @@
+diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
+--- mesa-orig/configure.ac	2016-05-25 15:37:44.191643017 +0200
++++ mesa-origb/configure.ac	2016-05-25 15:42:20.861654709 +0200
+@@ -813,10 +813,6 @@
+ dnl pkgconfig files.
+ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+ 
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+     [AS_HELP_STRING([--enable-selinux],