diff --git a/.SRCINFO b/.SRCINFO index 774d8aa..6e3fce0 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.80247.f30f6e2 + pkgver = 11.3.0_devel.80298.1d2ac7a pkgrel = 2 url = http://mesa3d.sourceforge.net arch = i686 @@ -47,7 +47,7 @@ pkgname = opencl-mesa-git depends = libcl depends = libclc depends = nettle - depends = mesa-git=11.3.0_devel.80247.f30f6e2 + depends = mesa-git=11.3.0_devel.80298.1d2ac7a optdepends = opencl-headers: headers necessary for OpenCL development provides = opencl-mesa=11.3.0-devel conflicts = opencl-mesa @@ -59,7 +59,7 @@ pkgname = mesa-vulkan-intel-git depends = libgcrypt depends = wayland depends = libxcb - depends = mesa-git=11.3.0_devel.80247.f30f6e2 + depends = mesa-git=11.3.0_devel.80298.1d2ac7a provides = vulkan-intel conflicts = vulkan-intel replaces = vulkan-intel @@ -67,18 +67,26 @@ 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.80247.f30f6e2 + depends = mesa-git=11.3.0_devel.80298.1d2ac7a 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.80247.f30f6e2 + depends = mesa-git=11.3.0_devel.80298.1d2ac7a 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.80298.1d2ac7a + provides = mesa-libgl=11.3.0-devel + provides = libgl=11.3.0-devel + conflicts = mesa-libgl + replaces = mesa-libgl + pkgname = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version depends = libdrm>=2.4.66 @@ -105,11 +113,3 @@ pkgname = mesa-git replaces = mesa-r300-r600-radeonsi-git replaces = mesa-dri -pkgname = mesa-libgl-git - pkgdesc = Mesa 3-D graphics library - depends = mesa-git=11.3.0_devel.80247.f30f6e2 - provides = mesa-libgl=11.3.0-devel - provides = libgl=11.3.0-devel - conflicts = mesa-libgl - replaces = mesa-libgl - diff --git a/PKGBUILD b/PKGBUILD index c376448..fcb0f1a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,21 +10,23 @@ # Contributor: Diego Jose pkgbase=mesa-git -pkgname=('opencl-mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-git' 'mesa-libgl-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.2.0_devel.75996.9c78cfd +pkgver=11.3.0_devel.80298.1d2ac7a pkgrel=2 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' 'libomxil-bellagio' 'libcl' 'libclc' 'clang-svn' 'git' 'nettle' 'libtxc_dxtn' 'ocl-icd' - 'libxvmc') + 'libxvmc' 'vulkan-icd-loader' 'libgcrypt') 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 mesa @@ -36,6 +38,11 @@ _mesaver() { [ -f $path ] && cat "$path" } +prepare() { + cd mesa + patch -p1 -i "${srcdir}/vulkan-fix-install-data-local.patch" +} + build () { cd mesa @@ -44,6 +51,7 @@ 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 \ @@ -126,6 +134,25 @@ package_opencl-mesa-git () { install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-git/" } +package_mesa-vulkan-intel-git() { + # using vulkan-intel-git would be better, but thatpackage 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}/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/" +} + package_libva-mesa-driver-git() { pkgdesc="VA-API implementation for gallium" depends=('nettle' "mesa-git=${pkgver}") @@ -218,4 +245,4 @@ package_mesa-libgl-git () { install -v -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl-git" install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl-git/" -} \ No newline at end of file +}