diff options
-rw-r--r-- | .SRCINFO | 60 | ||||
-rw-r--r-- | PKGBUILD | 39 | ||||
-rw-r--r-- | vulkan-fix-install-data-local.patch | 9 |
3 files changed, 79 insertions, 29 deletions
@@ -1,7 +1,5 @@ -# Generated by mksrcinfo v8 -# Thu Feb 4 15:08:54 UTC 2016 pkgbase = lib32-mesa-git - pkgver = 11.2.0_devel.75996.9c78cfd + pkgver = 11.3.0_devel.80298.1d2ac7a pkgrel = 1 url = http://mesa3d.sourceforge.net arch = x86_64 @@ -31,13 +29,16 @@ pkgbase = lib32-mesa-git makedepends = libva-mesa-driver-git makedepends = mesa-vdpau-git makedepends = mesa-libgl-git + makedepends = mesa-vulkan-intel-git makedepends = lib32-llvm-libs-svn makedepends = lib32-llvm-svn makedepends = lib32-libxvmc 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 = lib32-mesa-vdpau-git pkgdesc = Mesa VDPAU drivers (32-bit) @@ -52,6 +53,37 @@ pkgname = lib32-mesa-vdpau-git conflicts = lib32-mesa-vdpau replaces = lib32-mesa-vdpau +pkgname = lib32-mesa-vulkan-intel-git + pkgdesc = Vulkan driver for selected intel graphic chipsets + depends = lib32-wayland + depends = lib32-libxcb + depends = lib32-libxshmfence + depends = lib32-nettle + depends = mesa-vulkan-intel-git + provides = lib32-vulkan-intel + conflicts = lib32-vulkan-intel + replaces = lib32-vulkan-intel + +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 + conflicts = lib32-mesa-libgl + replaces = lib32-mesa-libgl + +pkgname = lib32-libva-mesa-driver-git + pkgdesc = VA-API implementation for gallium (32-bit) + depends = lib32-libdrm + depends = lib32-libx11 + depends = lib32-llvm-libs-svn + depends = lib32-expat + depends = lib32-elfutils + depends = lib32-nettle + depends = libva-mesa-driver-git + provides = lib32-libva-mesa-driver=11.3.0-devel + conflicts = lib32-libva-mesa-driver + pkgname = lib32-mesa-git pkgdesc = an open-source implementation of the OpenGL specification (32-bit) depends = lib32-libdrm @@ -68,7 +100,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= + provides = lib32-mesa=11.3.0-devel provides = lib32-mesa-dri provides = lib32-mesa-r300-r600-radeonsi-git conflicts = lib32-mesa @@ -78,23 +110,3 @@ pkgname = lib32-mesa-git replaces = lib32-mesa-dri replaces = lib32-mesa-r300-r600-radeonsi-git -pkgname = lib32-mesa-libgl-git - pkgdesc = Mesa 3-D graphics library (32-bit) - depends = lib32-mesa-git - provides = lib32-mesa-libgl= - provides = lib32-libgl= - conflicts = lib32-mesa-libgl - replaces = lib32-mesa-libgl - -pkgname = lib32-libva-mesa-driver-git - pkgdesc = VA-API implementation for gallium (32-bit) - depends = lib32-libdrm - depends = lib32-libx11 - depends = lib32-llvm-libs-svn - depends = lib32-expat - depends = lib32-elfutils - depends = lib32-nettle - depends = libva-mesa-driver-git - provides = lib32-libva-mesa-driver= - conflicts = lib32-libva-mesa-driver - @@ -11,20 +11,23 @@ # Contributor: Diego Jose <diegoxter1006@gmail.com> pkgbase=lib32-mesa-git -pkgname=('lib32-mesa-vdpau-git' 'lib32-mesa-git' 'lib32-mesa-libgl-git' 'lib32-libva-mesa-driver-git') -pkgver=11.2.0_devel.75996.9c78cfd +pkgname=('lib32-mesa-vdpau-git' 'lib32-mesa-vulkan-intel-git' 'lib32-mesa-libgl-git' 'lib32-libva-mesa-driver-git' 'lib32-mesa-git') +pkgver=11.3.0_devel.80298.1d2ac7a 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' 'lib32-llvm-libs-svn' 'lib32-llvm-svn' 'lib32-libxvmc' ) + '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' + ) url="http://mesa3d.sourceforge.net" license=('custom') source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master' - 'LICENSE') + 'LICENSE' + 'vulkan-fix-install-data-local.patch') md5sums=('SKIP' - '5c65a0fe315dd347e09b1f2826a1df5a') + '5c65a0fe315dd347e09b1f2826a1df5a' + '3db37a8e69dc3580ceb634305e654ec2') pkgver() { cd "${srcdir}/mesa" @@ -36,6 +39,11 @@ _mesaver() { [ -f $path ] && cat "$path" } +prepare() { + cd mesa + patch -p1 -i "${srcdir}/vulkan-fix-install-data-local.patch" +} + build() { export CC="gcc -m32" export CXX="g++ -m32" @@ -51,6 +59,7 @@ build() { --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ --with-gallium-drivers=i915,ilo,r300,r600,radeonsi,nouveau,swrast,virgl \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-vulkan-drivers=intel \ --with-egl-platforms=x11,drm,wayland \ --with-sha1=libnettle \ --enable-texture-float \ @@ -124,6 +133,26 @@ package_lib32-libva-mesa-driver-git() { install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver-git/" } +package_lib32-mesa-vulkan-intel-git() { + pkgdesc="Vulkan driver for selected intel graphic chipsets" + depends=('lib32-wayland' 'lib32-libxcb' 'lib32-libxshmfence' 'lib32-nettle' 'mesa-vulkan-intel-git') + provides=('lib32-vulkan-intel') + replaces=('lib32-vulkan-intel') + conflicts=('lib32-vulkan-intel') + +# skipping files installed by mesa-vulkan-intel-git +# install -m755 -d ${pkgdir}/etc +# mv -v ${srcdir}/fakeinstall/etc/vulkan ${pkgdir}/etc/ + + install -m755 -d ${pkgdir}/usr/lib32 + mv -v ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/ + # already installed by mesa-vulkan-intel-git + # mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan + + install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vulkan-intel-git" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vulkan-intel-git/" +} + package_lib32-mesa-vdpau-git() { pkgdesc="Mesa VDPAU drivers (32-bit)" depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs-svn' 'lib32-elfutils' 'mesa-vdpau-git' 'lib32-nettle') diff --git a/vulkan-fix-install-data-local.patch b/vulkan-fix-install-data-local.patch new file mode 100644 index 000000000000..9a6337d62881 --- /dev/null +++ b/vulkan-fix-install-data-local.patch @@ -0,0 +1,9 @@ +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 |