From 434452f4d8e52715454046874696af595a5d201f Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 23 Jul 2019 16:08:21 -0500 Subject: [PATCH] libGL: update to 19.1.3. - Include Vulkan ICD for Radeon and Intel. Closes #3293. --- srcpkgs/libGL/template | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index fdebc907e5b319..7b5b1875446114 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template file for 'libGL' pkgname=libGL -version=19.1.2 +version=19.1.3 revision=1 wrksrc="mesa-${version}" build_style=meson @@ -21,7 +21,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=813a144ea8ebefb7b48b6733f3f603855b0f61268d86cc1cc26a6b4be908fcfd +checksum=845460b2225d15c15d4a9743dec798ff0b7396b533011d43e774e67f7825b7e0 # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa" @@ -96,6 +96,13 @@ post_install() { vlicense docs/license.html vmkdir usr/lib/xorg/modules/extensions ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so + case "$XBPS_TARGET_MACHINE" in + i686*) + vsed -e 's#/usr/lib/#/usr/lib32/#g' \ + -i ${DESTDIR}/usr/share/vulkan/icd.d/radeon_icd.i686.json \ + -i ${DESTDIR}/usr/share/vulkan/icd.d/intel_icd.i686.json + ;; + esac } libglapi_package() { @@ -159,6 +166,7 @@ libxatracker_package() { mesa-ati-dri_package() { short_desc="Mesa DRI drivers for ATI GPUs" + lib32files="/usr/share/vulkan/icd.d/radeon_icd.i686.json" pkg_install() { vmove "usr/lib/libXvMCr[36]00.so.*" vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" @@ -180,6 +188,7 @@ mesa-ati-dri_package() { mesa-intel-dri_package() { short_desc="Mesa DRI drivers for Intel GPUs" + lib32files="/usr/share/vulkan/icd.d/intel_icd.i686.json" pkg_install() { vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*" vmove "usr/share/vulkan/icd.d/intel_icd*.json"