From 25ad721301925bfbc3d524a267238277fa676fe0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 19 Nov 2019 01:48:50 +0100 Subject: [PATCH] libGL: enable vulkan-overlay-layer closes #16637 --- srcpkgs/mesa-vulkan-overlay-layer | 1 + srcpkgs/mesa/template | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/mesa-vulkan-overlay-layer diff --git a/srcpkgs/mesa-vulkan-overlay-layer b/srcpkgs/mesa-vulkan-overlay-layer new file mode 120000 index 00000000000..5ef01dc565e --- /dev/null +++ b/srcpkgs/mesa-vulkan-overlay-layer @@ -0,0 +1 @@ +libGL \ No newline at end of file diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 6decd15c0d4..2c51cc3b680 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=19.2.7 -revision=2 +revision=3 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true @@ -10,7 +10,8 @@ configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless -Dllvm=true -Db_lto=false" hostmakedepends="flex libxml2-python llvm pkg-config - python3-Mako $(vopt_if wayland 'wayland-protocols wayland-devel')" + python3-Mako $(vopt_if wayland 'wayland-protocols wayland-devel') + glslang" makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel @@ -42,10 +43,11 @@ i686*|x86_64*) configure_args+=" -Dgallium-xa=true -Ddri3=true -Dgallium-nine=true" configure_args+=" -Dvulkan-drivers=intel,amd" configure_args+=" -Dgallium-opencl=icd" + configure_args+=" -Dvulkan-overlay-layer=true" hostmakedepends+=" clang" makedepends+=" libclc-git" subpackages+=" libxatracker mesa-ati-dri mesa-intel-dri mesa-nouveau-dri" - subpackages+=" mesa-vmwgfx-dri mesa-opencl" + subpackages+=" mesa-vmwgfx-dri mesa-opencl mesa-vulkan-overlay-layer" ;; ppc*) # Enable all ppc drivers. @@ -53,6 +55,7 @@ ppc*) configure_args+=" -Ddri-drivers=r100,r200,nouveau" configure_args+=" -Dgallium-xa=false -Ddri3=true -Dgallium-opencl=icd" configure_args+=" -Dvulkan-drivers=amd" + configure_args+=" -Dvulkan-overlay-layer=true" # Explicitly control power8 feature usage, disable on BE case "$XBPS_TARGET_MACHINE" in ppc64le*) configure_args+=" -Dpower8=true";; @@ -61,7 +64,7 @@ ppc*) hostmakedepends+=" clang" makedepends+=" libclc-git" subpackages+=" mesa-ati-dri mesa-nouveau-dri" - subpackages+=" mesa-opencl" + subpackages+=" mesa-opencl mesa-vulkan-overlay-layer" ;; aarch64*) configure_args+=" -Dgallium-drivers=nouveau,tegra,swrast,vc4" @@ -251,3 +254,11 @@ mesa-tegra-dri_package() { vmove "usr/lib/xorg/modules/drivers/tegra*" } } + +mesa-vulkan-overlay-layer_package() { + short_desc="Vulkan layer to display information about the running application" + pkg_install() { + vmove usr/lib/libVkLayer_MESA_overlay.so + vmove usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json + } +}