From 45fcea24733a7319c9f92b4b55a91fa4b42c774c Mon Sep 17 00:00:00 2001 From: LW-archlinux Date: Thu, 28 Apr 2016 21:59:38 +0200 Subject: [PATCH] build fail solved upstream, vulkan support re-enabled --- .SRCINFO | 12 ++++++------ PKGBUILD | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f3fc61d..a5b7080 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mesa-git 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 url = http://mesa3d.sourceforge.net arch = i686 @@ -45,7 +45,7 @@ pkgname = opencl-mesa-git depends = libcl depends = libclc 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 provides = opencl-mesa=11.3.0-devel conflicts = opencl-mesa @@ -57,7 +57,7 @@ pkgname = mesa-vulkan-intel-git depends = libgcrypt depends = wayland depends = libxcb - depends = mesa-git=11.3.0_devel.80749.7e7710a + depends = mesa-git=11.3.0_devel.80761.1a8c2cc provides = vulkan-intel conflicts = vulkan-intel replaces = vulkan-intel @@ -65,21 +65,21 @@ pkgname = mesa-vulkan-intel-git pkgname = libva-mesa-driver-git pkgdesc = VA-API implementation for gallium 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 conflicts = libva-mesa-driver pkgname = mesa-vdpau-git pkgdesc = Mesa VDPAU drivers 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 conflicts = mesa-vdpau replaces = mesa-vdpau pkgname = mesa-libgl-git 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 = libgl=11.3.0-devel conflicts = mesa-libgl diff --git a/PKGBUILD b/PKGBUILD index 9aca246..a4ce879 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ 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=11.3.0_devel.80749.7e7710a +pkgver=11.3.0_devel.80761.1a8c2cc pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto' @@ -60,8 +60,8 @@ build () { --enable-va \ --enable-opencl \ --enable-opencl-icd \ - --enable-glx-tls -# --with-vulkan-drivers=intel + --enable-glx-tls \ + --with-vulkan-drivers=intel @@ -139,12 +139,12 @@ package_mesa-vulkan-intel-git() { replaces=('vulkan-intel') conflicts=('vulkan-intel') - #install -m755 -d ${pkgdir}/etc - #mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/ + 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/{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/mesa-vulkan-intel-git" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vulkan-intel-git/"