diff --git a/x11/vulkan/vulkan/actions.py b/x11/vulkan/vulkan/actions.py
index 0bbddc3819..f715116105 100755
--- a/x11/vulkan/vulkan/actions.py
+++ b/x11/vulkan/vulkan/actions.py
@@ -15,7 +15,7 @@ from pisi.actionsapi import get
ver = get.srcVERSION()
def setup():
-
+
loader_opts = "-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=/share \
@@ -28,6 +28,7 @@ def setup():
-DVULKAN_HEADERS_INSTALL_DIR='/usr' \
"
validation_opts = " -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_PREFIX_PATH=/usr \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=/share \
-DCMAKE_SKIP_RPATH=True \
@@ -41,35 +42,35 @@ def setup():
-DUSE_ROBIN_HOOD_HASHING=OFF \
-DGLSLANG_INSTALL_DIR=/usr \
"
-
+
if get.buildTYPE() == "_emul32":
shelltools.export("ASFLAGS", "--32")
shelltools.export("CFLAGS", "-m32")
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")
-
+
loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
-DCMAKE_ASM_FLAGS='--32' \
"
-
+
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.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.makedirs("build")
shelltools.cd("build")
# shelltools.system("../scripts/update_deps.py")
validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
"
-
+
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")
shelltools.export("CC", "gcc")
@@ -77,42 +78,42 @@ def setup():
loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
-DSPIRV_HEADERS_INSTALL_DIR='/usr/include/spirv' \
"
-
+
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.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
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("-j4")
-
- shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
+
+ shelltools.cd("%s/Vulkan-ValidationLayers-sdk-%s" %(get.workDIR(), ver))
# shelltools.cd("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("build")
cmaketools.make("-j4")
-
+
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("%s/Vulkan-ValidationLayers-master" % get.workDIR())
shelltools.cd("build")
- autotools.rawInstall("DESTDIR=%s" %get.installDIR())
-
+ autotools.rawInstall("DESTDIR=%s" %get.installDIR())
+
#pisitools.dodoc("README.md", "COPYRIGHT.txt", "LICENSE.txt")
diff --git a/x11/vulkan/vulkan/pspec.xml b/x11/vulkan/vulkan/pspec.xml
index eb721eb7c8..f1636f35ea 100755
--- a/x11/vulkan/vulkan/pspec.xml
+++ b/x11/vulkan/vulkan/pspec.xml
@@ -13,22 +13,22 @@
vulkan
Vulkan headers, loaders and validations layers
Vulkan headers, loaders and validations layers
- https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.246.tar.gz
- https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v1.3.246.tar.gz
+ https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/sdk-1.3.261.0.tar.gz
+ https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/sdk-1.3.261.0.tar.gz
python3-lxml
libX11-devel
libXrandr-devel
wayland-devel
- vulkan-headers
+ vulkan-headers
cmake
git
- spirv-headers
- glslang-devel
+ spirv-headers
+ glslang-devel
wayland-server
wayland-client
wayland-cursor
- spirv-tools-devel
+ spirv-tools-devel
@@ -91,6 +91,13 @@
+
+ 2023-09-26
+ 1.3.261.0
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2023-04-01
1.3.246