diff --git a/x11/vulkan/vulkan-lunarg-tools/actions.py b/x11/vulkan/vulkan-lunarg-tools/actions.py index ccbc91b993..973a3c5b1e 100755 --- a/x11/vulkan/vulkan-lunarg-tools/actions.py +++ b/x11/vulkan/vulkan-lunarg-tools/actions.py @@ -13,15 +13,16 @@ from pisi.actionsapi import get pisitools.cxxflags.add("-std=gnu++11") ver = get.srcVERSION() -indir = "%s/VulkanTools-%s" % (get.workDIR(), ver) +indir = "%s/VulkanTools-vulkan-sdk-%s" % (get.workDIR(), ver) def setup(): - shelltools.system("./update_external_sources.sh") + # shelltools.system("./update_external_sources.sh") shelltools.system("mkdir -p build") shelltools.cd("build") - shelltools.system("../scripts/update_deps.py") + # shelltools.system("../scripts/update_deps.py") - shelltools.system("cmake .. -C helper.cmake \ + shelltools.system("cmake .. \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DCMAKE_INSTALL_DATADIR=/usr/share \ @@ -32,11 +33,11 @@ def setup(): -DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_TESTS=OFF \ -DBUILD_VIA=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DVULKAN_HEADERS_INSTALL_DIR=%s/build/Vulkan-Headers/build/install \ - -DVULKAN_LOADER_INSTALL_DIR=%s/build/Vulkan-Loader/build/install \ - -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=%s/build/Vulkan-ValidationLayers/build/install \ - " % (indir, indir, indir ) ) + -DCMAKE_BUILD_TYPE=Release" ) + # -DVULKAN_HEADERS_INSTALL_DIR=%s/build/Vulkan-Headers/build/install \ + # -DVULKAN_LOADER_INSTALL_DIR=%s/build/Vulkan-Loader/build/install \ + # -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=%s/build/Vulkan-ValidationLayers/build/install \ + # % (indir, indir, indir ) ) @@ -49,7 +50,7 @@ def install(): shelltools.cd("build") autotools.rawInstall("DESTDIR=%s" %get.installDIR()) shelltools.cd("..") - pisitools.insinto("/usr/share/doc/vulkan-trace", "vktrace/LICENSE") + # pisitools.insinto("/usr/share/doc/vulkan-trace", "vktrace/LICENSE") pisitools.insinto("/usr/share/doc/vulkan-extra-layers", "CONTRIBUTING.md") pisitools.insinto("/usr/share/doc/vulkan-extra-layers", "GOVERNANCE.md") pisitools.insinto("/usr/share/doc/vulkan-extra-layers", "LICENSE.txt") diff --git a/x11/vulkan/vulkan-lunarg-tools/pspec.xml b/x11/vulkan/vulkan-lunarg-tools/pspec.xml index 5d5d7fce10..e91b2eebb2 100755 --- a/x11/vulkan/vulkan-lunarg-tools/pspec.xml +++ b/x11/vulkan/vulkan-lunarg-tools/pspec.xml @@ -12,20 +12,21 @@ app:console Extra Vulkan tools from LunarG This project provides vktrace capture/replay tool, the Layer Factory, and other layer tools and driver tests. - https://sourceforge.net/projects/pisilinux/files/source/VulkanTools-1.1.130.0.tar.xz + https://github.com/LunarG/VulkanTools/archive/refs/tags/vulkan-sdk-1.4.341.1.tar.gz + git + cmake libX11-devel libxcb-devel libXrandr-devel wayland-devel vulkan-headers vulkan-devel - qt5-svg-devel - qt5-webengine-devel + qt6-svg-devel + qt6-webengine-devel xcb-util-keysyms-devel xcb-util-wm-devel - git - cmake + vulkan-utility-libraries-devel @@ -37,9 +38,9 @@ libXrandr wayland vulkan - qt5-base - qt5-svg - qt5-webengine + qt6-base + qt6-svg + qt6-webengine xcb-util-wm wayland-client xcb-util-keysyms @@ -67,6 +68,13 @@ + + 2026-02-27 + 1.4.341.1 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2019-11-15 1.1.130.0