summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD14
-rw-r--r--remove-libpthread-stubs.patch14
3 files changed, 31 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 680600832076..25118f24db09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version for multilib applications
- pkgver = 11.3.0_devel.81816.998829f
+ pkgver = 12.1.0_devel.82587.154c0a4
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
@@ -34,11 +34,12 @@ pkgbase = lib32-mesa-git
makedepends = lib32-llvm-libs-svn
makedepends = lib32-llvm-svn
makedepends = lib32-libxvmc
- makedepends = libpthread-stubs
source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master
source = LICENSE
+ source = remove-libpthread-stubs.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+ md5sums = e417399ed46be7f61da7246503965b13
pkgname = lib32-mesa-vdpau-git
pkgdesc = Mesa VDPAU drivers (32-bit)
@@ -67,8 +68,8 @@ pkgname = lib32-mesa-vulkan-intel-git
pkgname = lib32-mesa-libgl-git
pkgdesc = Mesa 3-D graphics library (32-bit)
depends = lib32-mesa-git
- provides = lib32-mesa-libgl=11.3.0-devel
- provides = lib32-libgl=11.3.0-devel
+ provides = lib32-mesa-libgl=12.1.0-devel
+ provides = lib32-libgl=12.1.0-devel
conflicts = lib32-mesa-libgl
replaces = lib32-mesa-libgl
@@ -81,7 +82,7 @@ pkgname = lib32-libva-mesa-driver-git
depends = lib32-elfutils
depends = lib32-nettle
depends = libva-mesa-driver-git
- provides = lib32-libva-mesa-driver=11.3.0-devel
+ provides = lib32-libva-mesa-driver=12.1.0-devel
conflicts = lib32-libva-mesa-driver
pkgname = lib32-mesa-git
@@ -100,7 +101,7 @@ pkgname = lib32-mesa-git
depends = lib32-nettle
optdepends = opengl-man-pages: for the OpenGL API man pages
optdepends = lib32-mesa-vdpau-git: for accelerated video playback
- provides = lib32-mesa=11.3.0-devel
+ provides = lib32-mesa=12.1.0-devel
provides = lib32-mesa-dri
provides = lib32-mesa-r300-r600-radeonsi-git
conflicts = lib32-mesa
diff --git a/PKGBUILD b/PKGBUILD
index 1102e96c2e4f..c78cf83d1e2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,21 +13,27 @@
pkgbase=lib32-mesa-git
pkgname=('lib32-mesa-vdpau-git' 'lib32-mesa-vulkan-intel-git' 'lib32-mesa-libgl-git' 'lib32-libva-mesa-driver-git' 'lib32-mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version for multilib applications"
-pkgver=11.3.0_devel.81816.998829f
+pkgver=12.1.0_devel.82587.154c0a4
pkgrel=1
arch=('x86_64')
makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-systemd'
'lib32-libvdpau' 'lib32-wayland' 'python2-mako' 'lib32-libtxc_dxtn' 'git' 'lib32-nettle'
'mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' 'mesa-vulkan-intel-git' 'lib32-llvm-libs-svn' 'lib32-llvm-svn' 'lib32-libxvmc'
- 'libpthread-stubs')
+ )
url="http://mesa3d.sourceforge.net"
license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master'
- 'LICENSE')
+ 'LICENSE'
+ 'remove-libpthread-stubs.patch')
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
- )
+ 'e417399ed46be7f61da7246503965b13')
+
+prepare() {
+ cd ${srcdir}/mesa
+ patch -Np1 -i ../remove-libpthread-stubs.patch
+}
pkgver() {
cd "${srcdir}/mesa"
diff --git a/remove-libpthread-stubs.patch b/remove-libpthread-stubs.patch
new file mode 100644
index 000000000000..5b44d03cc4fd
--- /dev/null
+++ b/remove-libpthread-stubs.patch
@@ -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],