[arch-commits] Commit in mesa/trunk (PKGBUILD remove-libpthread-stubs.patch)
Laurent Carlier
lcarlier at archlinux.org
Thu Oct 27 09:14:52 UTC 2016
Date: Thursday, October 27, 2016 @ 09:14:51
Author: lcarlier
Revision: 279318
upgpkg: mesa 13.0.0rc2-1
upstream update 13.0.0-rc2 - and llvm-3.9.0 rebuild
Modified:
mesa/trunk/PKGBUILD
mesa/trunk/remove-libpthread-stubs.patch
-------------------------------+
PKGBUILD | 60 ++++++++++++++++++++++------------------
remove-libpthread-stubs.patch | 25 ++++++++--------
2 files changed, 46 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-27 08:42:01 UTC (rev 279317)
+++ PKGBUILD 2016-10-27 09:14:51 UTC (rev 279318)
@@ -3,9 +3,9 @@
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
pkgbase=mesa
-pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
-pkgver=12.0.3
-pkgrel=3
+pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
+pkgver=13.0.0rc2
+pkgrel=1
arch=('i686' 'x86_64')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -12,17 +12,14 @@
'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}
+#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/mesa/13.0.0/mesa-13.0.0-rc2.tar.xz{,.sig}
LICENSE
- remove-libpthread-stubs.patch
- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch)
-sha256sums=('1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1'
+ remove-libpthread-stubs.patch)
+sha256sums=('ef26031a79b915e1643b0ffe5354f8ae774cd445f12b342abac63438f9735a43'
'SKIP'
'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
- 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
- '52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780'
- '96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a')
+ '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
prepare() {
@@ -31,11 +28,6 @@
# Now mesa checks for libpthread-stubs - so remove the check
patch -Np1 -i ../remove-libpthread-stubs.patch
- # fix FS#50240 - https://bugs.freedesktop.org/show_bug.cgi?id=71759
- # merged upstream
- patch -Np1 -i ../0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
- patch -Np1 -i ../0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
-
autoreconf -fiv
}
@@ -48,7 +40,7 @@
--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-vulkan-drivers=intel,radeon \
--with-sha1=libgcrypt \
--disable-xvmc \
--enable-gallium-llvm \
@@ -67,7 +59,8 @@
--enable-vdpau \
--enable-omx \
--enable-nine \
- --enable-opencl --enable-opencl-icd \
+ --enable-opencl \
+ --enable-opencl-icd \
--with-clang-libdir=/usr/lib
make
@@ -79,7 +72,7 @@
package_opencl-mesa() {
pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
- depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang')
+ depends=('expat' 'libdrm' 'libelf' 'libgcrypt' 'opencl-icd-loader' 'libclc' 'clang')
optdepends=('opencl-headers: headers necessary for OpenCL development')
install -m755 -d ${pkgdir}/etc
@@ -95,10 +88,10 @@
package_vulkan-intel() {
pkgdesc="Intel's Vulkan mesa driver"
- depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb')
+ depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libx11' 'libxshmfence')
- install -m755 -d ${pkgdir}/usr/share
- mv -v ${srcdir}/fakeinstall/usr/share/vulkan ${pkgdir}/usr/share/
+ install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+ mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
@@ -108,9 +101,24 @@
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
}
+package_vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver"
+ depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libx11' 'libxshmfence' 'libelf'
+ 'libdrm' 'llvm-libs')
+
+ install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+ mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+
+ install -m755 -d ${pkgdir}/usr/lib
+ mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon-git"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon-git/"
+}
+
package_libva-mesa-driver() {
pkgdesc="VA-API implementation for gallium"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libgcrypt' 'libxshmfence')
install -m755 -d ${pkgdir}/usr/lib
cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
@@ -121,7 +129,7 @@
package_mesa-vdpau() {
pkgdesc="Mesa VDPAU drivers"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libgcrypt' 'libxshmfence')
install -m755 -d ${pkgdir}/usr/lib
cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
@@ -132,8 +140,8 @@
package_mesa() {
pkgdesc="an open-source implementation of the OpenGL specification"
- depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils'
- 'libomxil-bellagio' 'expat' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs')
+ depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
+ 'libomxil-bellagio' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages'
'mesa-vdpau: for accelerated video playback'
'libva-mesa-driver: for accelerated video playback')
Modified: remove-libpthread-stubs.patch
===================================================================
--- remove-libpthread-stubs.patch 2016-10-27 08:42:01 UTC (rev 279317)
+++ remove-libpthread-stubs.patch 2016-10-27 09:14:51 UTC (rev 279318)
@@ -1,14 +1,13 @@
-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"
+diff --git a/configure.ac b/configure.ac
+index 54416b4..8a708d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -824,7 +824,7 @@ 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],
+ dnl pthread-stubs is mandatory on targets where it exists
+ case "$host_os" in
+-cygwin* )
++cygwin* | linux* )
+ pthread_stubs_possible="no"
+ ;;
+ * )
More information about the arch-commits
mailing list