pthread stubs patch improved & renamed
This commit is contained in:
parent
95c44c12d0
commit
957ace37a0
18
.SRCINFO
18
.SRCINFO
@ -1,7 +1,7 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 12.1.0_devel.83009.7a9d6ab
|
||||
pkgrel = 1.1
|
||||
pkgver = 12.1.0_devel.83426.d2b4b16
|
||||
pkgrel = 1
|
||||
url = http://mesa3d.sourceforge.net
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
@ -35,10 +35,10 @@ pkgbase = mesa-git
|
||||
makedepends = libgcrypt
|
||||
source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master
|
||||
source = LICENSE
|
||||
source = remove-libpthread-stubs.patch
|
||||
source = disable-pthread-stubs-on-linux.patch
|
||||
md5sums = SKIP
|
||||
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
|
||||
md5sums = e417399ed46be7f61da7246503965b13
|
||||
md5sums = a1435715781d62ce096295c5ce656d5c
|
||||
|
||||
pkgname = opencl-mesa-git
|
||||
pkgdesc = OpenCL support for AMD/ATI Radeon Mesa drivers
|
||||
@ -47,7 +47,7 @@ pkgname = opencl-mesa-git
|
||||
depends = libcl
|
||||
depends = libclc
|
||||
depends = nettle
|
||||
depends = mesa-git=12.1.0_devel.83009.7a9d6ab
|
||||
depends = mesa-git=12.1.0_devel.83426.d2b4b16
|
||||
optdepends = opencl-headers: headers necessary for OpenCL development
|
||||
provides = opencl-mesa=12.1.0-devel
|
||||
conflicts = opencl-mesa
|
||||
@ -59,7 +59,7 @@ pkgname = mesa-vulkan-intel-git
|
||||
depends = libgcrypt
|
||||
depends = wayland
|
||||
depends = libxcb
|
||||
depends = mesa-git=12.1.0_devel.83009.7a9d6ab
|
||||
depends = mesa-git=12.1.0_devel.83426.d2b4b16
|
||||
provides = vulkan-intel
|
||||
conflicts = vulkan-intel
|
||||
replaces = vulkan-intel
|
||||
@ -67,21 +67,21 @@ pkgname = mesa-vulkan-intel-git
|
||||
pkgname = libva-mesa-driver-git
|
||||
pkgdesc = VA-API implementation for gallium
|
||||
depends = nettle
|
||||
depends = mesa-git=12.1.0_devel.83009.7a9d6ab
|
||||
depends = mesa-git=12.1.0_devel.83426.d2b4b16
|
||||
provides = libva-mesa-driver=12.1.0-devel
|
||||
conflicts = libva-mesa-driver
|
||||
|
||||
pkgname = mesa-vdpau-git
|
||||
pkgdesc = Mesa VDPAU drivers
|
||||
depends = nettle
|
||||
depends = mesa-git=12.1.0_devel.83009.7a9d6ab
|
||||
depends = mesa-git=12.1.0_devel.83426.d2b4b16
|
||||
provides = mesa-vdpau=12.1.0-devel
|
||||
conflicts = mesa-vdpau
|
||||
replaces = mesa-vdpau
|
||||
|
||||
pkgname = mesa-libgl-git
|
||||
pkgdesc = Mesa 3-D graphics library
|
||||
depends = mesa-git=12.1.0_devel.83009.7a9d6ab
|
||||
depends = mesa-git=12.1.0_devel.83426.d2b4b16
|
||||
provides = mesa-libgl=12.1.0-devel
|
||||
provides = libgl=12.1.0-devel
|
||||
conflicts = mesa-libgl
|
||||
|
10
PKGBUILD
10
PKGBUILD
@ -12,8 +12,8 @@
|
||||
pkgbase=mesa-git
|
||||
pkgname=('opencl-mesa-git' 'mesa-vulkan-intel-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' 'mesa-git')
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=12.1.0_devel.83009.7a9d6ab
|
||||
pkgrel=1.1
|
||||
pkgver=12.1.0_devel.83426.d2b4b16
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto'
|
||||
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm-svn'
|
||||
@ -23,14 +23,14 @@ url="http://mesa3d.sourceforge.net"
|
||||
license=('custom')
|
||||
source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master'
|
||||
'LICENSE'
|
||||
'remove-libpthread-stubs.patch')
|
||||
'disable-pthread-stubs-on-linux.patch')
|
||||
md5sums=('SKIP'
|
||||
'5c65a0fe315dd347e09b1f2826a1df5a'
|
||||
'e417399ed46be7f61da7246503965b13')
|
||||
'a1435715781d62ce096295c5ce656d5c')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/mesa
|
||||
patch -Np1 -i ../remove-libpthread-stubs.patch
|
||||
patch -Np1 -i ../disable-pthread-stubs-on-linux.patch
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
|
12
disable-pthread-stubs-on-linux.patch
Normal file
12
disable-pthread-stubs-on-linux.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -aur mesa.a/configure.ac mesa.b/configure.ac
|
||||
--- mesa.a/configure.ac 2016-07-21 01:37:47.000000000 +0200
|
||||
+++ mesa.b/configure.ac 2016-07-21 01:46:59.426168060 +0200
|
||||
@@ -825,7 +825,7 @@
|
||||
|
||||
dnl pthread-stubs is mandatory on targets where it exists
|
||||
case "$host_os" in
|
||||
-cygwin* )
|
||||
+cygwin* | linux* )
|
||||
pthread_stubs_possible="no"
|
||||
;;
|
||||
* )
|
@ -1,14 +0,0 @@
|
||||
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],
|
Loading…
Reference in New Issue
Block a user