build fail solved upstream, vulkan support re-enabled

This commit is contained in:
LW-archlinux 2016-04-28 21:59:38 +02:00
parent d535a64b88
commit 45fcea2473
2 changed files with 14 additions and 14 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 11.3.0_devel.80749.7e7710a pkgver = 11.3.0_devel.80761.1a8c2cc
pkgrel = 1 pkgrel = 1
url = http://mesa3d.sourceforge.net url = http://mesa3d.sourceforge.net
arch = i686 arch = i686
@ -45,7 +45,7 @@ pkgname = opencl-mesa-git
depends = libcl depends = libcl
depends = libclc depends = libclc
depends = nettle depends = nettle
depends = mesa-git=11.3.0_devel.80749.7e7710a depends = mesa-git=11.3.0_devel.80761.1a8c2cc
optdepends = opencl-headers: headers necessary for OpenCL development optdepends = opencl-headers: headers necessary for OpenCL development
provides = opencl-mesa=11.3.0-devel provides = opencl-mesa=11.3.0-devel
conflicts = opencl-mesa conflicts = opencl-mesa
@ -57,7 +57,7 @@ pkgname = mesa-vulkan-intel-git
depends = libgcrypt depends = libgcrypt
depends = wayland depends = wayland
depends = libxcb depends = libxcb
depends = mesa-git=11.3.0_devel.80749.7e7710a depends = mesa-git=11.3.0_devel.80761.1a8c2cc
provides = vulkan-intel provides = vulkan-intel
conflicts = vulkan-intel conflicts = vulkan-intel
replaces = vulkan-intel replaces = vulkan-intel
@ -65,21 +65,21 @@ pkgname = mesa-vulkan-intel-git
pkgname = libva-mesa-driver-git pkgname = libva-mesa-driver-git
pkgdesc = VA-API implementation for gallium pkgdesc = VA-API implementation for gallium
depends = nettle depends = nettle
depends = mesa-git=11.3.0_devel.80749.7e7710a depends = mesa-git=11.3.0_devel.80761.1a8c2cc
provides = libva-mesa-driver=11.3.0-devel provides = libva-mesa-driver=11.3.0-devel
conflicts = libva-mesa-driver conflicts = libva-mesa-driver
pkgname = mesa-vdpau-git pkgname = mesa-vdpau-git
pkgdesc = Mesa VDPAU drivers pkgdesc = Mesa VDPAU drivers
depends = nettle depends = nettle
depends = mesa-git=11.3.0_devel.80749.7e7710a depends = mesa-git=11.3.0_devel.80761.1a8c2cc
provides = mesa-vdpau=11.3.0-devel provides = mesa-vdpau=11.3.0-devel
conflicts = mesa-vdpau conflicts = mesa-vdpau
replaces = mesa-vdpau replaces = mesa-vdpau
pkgname = mesa-libgl-git pkgname = mesa-libgl-git
pkgdesc = Mesa 3-D graphics library pkgdesc = Mesa 3-D graphics library
depends = mesa-git=11.3.0_devel.80749.7e7710a depends = mesa-git=11.3.0_devel.80761.1a8c2cc
provides = mesa-libgl=11.3.0-devel provides = mesa-libgl=11.3.0-devel
provides = libgl=11.3.0-devel provides = libgl=11.3.0-devel
conflicts = mesa-libgl conflicts = mesa-libgl

View File

@ -12,7 +12,7 @@
pkgbase=mesa-git pkgbase=mesa-git
pkgname=('opencl-mesa-git' 'mesa-vulkan-intel-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' '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" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=11.3.0_devel.80749.7e7710a pkgver=11.3.0_devel.80761.1a8c2cc
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto' makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto'
@ -60,8 +60,8 @@ build () {
--enable-va \ --enable-va \
--enable-opencl \ --enable-opencl \
--enable-opencl-icd \ --enable-opencl-icd \
--enable-glx-tls --enable-glx-tls \
# --with-vulkan-drivers=intel --with-vulkan-drivers=intel
@ -139,12 +139,12 @@ package_mesa-vulkan-intel-git() {
replaces=('vulkan-intel') replaces=('vulkan-intel')
conflicts=('vulkan-intel') conflicts=('vulkan-intel')
#install -m755 -d ${pkgdir}/etc install -m755 -d ${pkgdir}/etc
#mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/ mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/
#install -m755 -d ${pkgdir}/usr/{include/vulkan,lib} 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/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
#mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git" install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git/" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git/"