From d535a64b885aac433927a37980599491278786d9 Mon Sep 17 00:00:00 2001 From: LW-archlinux Date: Thu, 28 Apr 2016 14:51:51 +0200 Subject: [PATCH] vulkan support commented out due to build failure --- .SRCINFO | 14 ++++++-------- PKGBUILD | 29 +++++++++++++---------------- vulkan-fix-install-data-local.patch | 9 --------- 3 files changed, 19 insertions(+), 33 deletions(-) delete mode 100644 vulkan-fix-install-data-local.patch diff --git a/.SRCINFO b/.SRCINFO index 6532d08..f3fc61d 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.80341.899bd63 + pkgver = 11.3.0_devel.80749.7e7710a pkgrel = 1 url = http://mesa3d.sourceforge.net arch = i686 @@ -35,10 +35,8 @@ pkgbase = mesa-git makedepends = libgcrypt source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master source = LICENSE - source = vulkan-fix-install-data-local.patch md5sums = SKIP md5sums = 5c65a0fe315dd347e09b1f2826a1df5a - md5sums = 3db37a8e69dc3580ceb634305e654ec2 pkgname = opencl-mesa-git pkgdesc = OpenCL support for AMD/ATI Radeon Mesa drivers @@ -47,7 +45,7 @@ pkgname = opencl-mesa-git depends = libcl depends = libclc depends = nettle - depends = mesa-git=11.3.0_devel.80341.899bd63 + depends = mesa-git=11.3.0_devel.80749.7e7710a optdepends = opencl-headers: headers necessary for OpenCL development provides = opencl-mesa=11.3.0-devel conflicts = opencl-mesa @@ -59,7 +57,7 @@ pkgname = mesa-vulkan-intel-git depends = libgcrypt depends = wayland depends = libxcb - depends = mesa-git=11.3.0_devel.80341.899bd63 + depends = mesa-git=11.3.0_devel.80749.7e7710a provides = vulkan-intel conflicts = vulkan-intel replaces = vulkan-intel @@ -67,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.80341.899bd63 + depends = mesa-git=11.3.0_devel.80749.7e7710a 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.80341.899bd63 + depends = mesa-git=11.3.0_devel.80749.7e7710a 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.80341.899bd63 + depends = mesa-git=11.3.0_devel.80749.7e7710a provides = mesa-libgl=11.3.0-devel provides = libgl=11.3.0-devel conflicts = mesa-libgl diff --git a/PKGBUILD b/PKGBUILD index 95c951c..9aca246 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.80341.899bd63 +pkgver=11.3.0_devel.80749.7e7710a pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2proto' 'dri3proto' 'presentproto' @@ -22,11 +22,10 @@ makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm>=2.4.66' 'dri2p url="http://mesa3d.sourceforge.net" license=('custom') source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master' - 'LICENSE' - 'vulkan-fix-install-data-local.patch') + 'LICENSE') md5sums=('SKIP' '5c65a0fe315dd347e09b1f2826a1df5a' - '3db37a8e69dc3580ceb634305e654ec2') + ) pkgver() { cd mesa @@ -38,11 +37,6 @@ _mesaver() { [ -f $path ] && cat "$path" } -prepare() { - cd mesa - patch -p1 -i "${srcdir}/vulkan-fix-install-data-local.patch" -} - build () { cd mesa @@ -51,7 +45,6 @@ build () { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=i915,ilo,r300,r600,radeonsi,nouveau,svga,swrast,virgl \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-vulkan-drivers=intel \ --with-egl-platforms=x11,drm,wayland \ --with-clang-libdir=/usr/lib \ --with-sha1=libnettle \ @@ -68,6 +61,10 @@ build () { --enable-opencl \ --enable-opencl-icd \ --enable-glx-tls +# --with-vulkan-drivers=intel + + + # # configure flag description default overridden @@ -135,19 +132,19 @@ package_opencl-mesa-git () { } package_mesa-vulkan-intel-git() { - # using vulkan-intel-git would be better, but thatpackage already exists + # using vulkan-intel-git would be better, but that package already exists pkgdesc="Vulkan driver for selected intel graphic chipsets" depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb' "mesa-git=${pkgver}") provides=('vulkan-intel') 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/" diff --git a/vulkan-fix-install-data-local.patch b/vulkan-fix-install-data-local.patch deleted file mode 100644 index 9a6337d..0000000 --- a/vulkan-fix-install-data-local.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -aur mesa.pristine/src/intel/vulkan/Makefile.am mesa.new/src/intel/vulkan/Makefile.am ---- mesa.pristine/src/intel/vulkan/Makefile.am 2016-04-16 15:48:19.000000000 +0200 -+++ mesa.new/src/intel/vulkan/Makefile.am 2016-04-16 16:12:04.667578182 +0200 -@@ -209,4 +209,4 @@ - include $(top_srcdir)/install-lib-links.mk - - install-data-local: -- $(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(VULKAN_ICD_INSTALL_DIR)/intel_icd.json -+ $(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(DESTDIR)$(VULKAN_ICD_INSTALL_DIR)/intel_icd.json