diff --git a/x11/vulkan/vulkan/actions.py b/x11/vulkan/vulkan/actions.py index 4d44f6acdd..051dace01b 100755 --- a/x11/vulkan/vulkan/actions.py +++ b/x11/vulkan/vulkan/actions.py @@ -37,7 +37,6 @@ def setup(): -DBUILD_SHARED_LIBS=ON \ -DBUILD_LAYER_SUPPORT_FILES=ON \ -DSPIRV_TOOLS_INSTALL_DIR='/usr' \ - -DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \ -DUSE_ROBIN_HOOD_HASHING=OFF \ -DGLSLANG_INSTALL_DIR=/usr \ " @@ -48,7 +47,7 @@ def setup(): shelltools.export("CXXFLAGS", "-m32") shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") - shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-Loader-sdk-%s" %(get.workDIR(), ver)) shelltools.makedirs("build") shelltools.cd("build") @@ -58,7 +57,7 @@ def setup(): cmaketools.configure(loader_opts, sourceDir="..") - shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver)) shelltools.makedirs("build") shelltools.cd("build") #shelltools.system("../scripts/update_deps.py") @@ -71,7 +70,7 @@ def setup(): cmaketools.configure(validation_opts, sourceDir="..") else: - shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-Loader-sdk-%s" %(get.workDIR(), ver)) shelltools.makedirs("build") shelltools.cd("build") @@ -80,34 +79,35 @@ def setup(): cmaketools.configure(loader_opts, sourceDir="..") - shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver)) shelltools.makedirs("build") shelltools.cd("build") #shelltools.system("../scripts/update_deps.py") validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \ -DSPIRV_TOOLS_LIB='/usr/lib' \ + -DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \ -DSPIRV_TOOLS_OPT_LIB='/usr/lib' \ " cmaketools.configure(validation_opts, sourceDir="..") def build(): - shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-Loader-sdk-%s" %(get.workDIR(), ver)) shelltools.cd("build") cmaketools.make("-j1") - shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver)) shelltools.cd("build") cmaketools.make("-j1") def install(): - shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-Loader-sdk-%s" %(get.workDIR(), ver)) shelltools.cd("build") autotools.rawInstall("DESTDIR=%s" %get.installDIR()) - shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver)) + shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver)) shelltools.cd("build") autotools.rawInstall("DESTDIR=%s" %get.installDIR()) diff --git a/x11/vulkan/vulkan/pspec.xml b/x11/vulkan/vulkan/pspec.xml index 11a4b66972..1de285cf78 100755 --- a/x11/vulkan/vulkan/pspec.xml +++ b/x11/vulkan/vulkan/pspec.xml @@ -12,23 +12,23 @@ library Vulkan headers, loaders and validations layers Vulkan headers, loaders and validations layers - https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.2.201.tar.gz - https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.201.tar.gz + https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/sdk-1.3.211.0.tar.gz + https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/sdk-1.3.211.0.tar.gz python3-lxml libX11-devel libXrandr-devel wayland-devel - vulkan-headers + vulkan-headers cmake git - spirv-headers + spirv-headers glslang-devel wayland-server wayland-client wayland-cursor - spirv-tools-devel + spirv-tools-devel @@ -84,6 +84,13 @@ + + 2022-04-21 + 1.3.211.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-12-17 1.2.201