diff --git a/x11/vulkan/vulkan/actions.py b/x11/vulkan/vulkan/actions.py
index 770bd1d2db..42145975b0 100755
--- a/x11/vulkan/vulkan/actions.py
+++ b/x11/vulkan/vulkan/actions.py
@@ -15,8 +15,8 @@ pisitools.cxxflags.add("-std=gnu++11")
ver = get.srcVERSION()
def setup():
-
- loader_opts = "-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+
+ loader_opts = "-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_DATADIR=/share \
-DCMAKE_SKIP_RPATH=True \
-DBUILD_TESTS=Off \
@@ -26,7 +26,7 @@ def setup():
-DBUILD_SHARED_LIBS=ON \
-DVULKAN_HEADERS_INSTALL_DIR='/usr' \
"
- validation_opts = "-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ validation_opts = " -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_DATADIR=/share \
-DCMAKE_SKIP_RPATH=True \
-DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \
@@ -35,65 +35,74 @@ def setup():
-DBUILD_WSI_XLIB_SUPPORT=On \
-DBUILD_WSI_WAYLAND_SUPPORT=On \
-DBUILD_SHARED_LIBS=ON \
- -DVULKAN_HEADERS_INSTALL_DIR='/usr/include' \
-DBUILD_LAYER_SUPPORT_FILES=ON \
- -DGLSLANG_INSTALL_DIR=glslang/build/install \
+ -DSPIRV_HEADERS_INSTALL_DIR=/usr \
+ -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))
-
- loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
+
+ 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.makedirs("build")
+ shelltools.cd("build")
+
+ loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
-DCMAKE_ASM_FLAGS='--32' \
- "
-
- cmaketools.configure(loader_opts)
-
- shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
- shelltools.system("scripts/update_deps.py")
- validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
+ "
+
+ cmaketools.configure(loader_opts, sourceDir="..")
+
+ shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
+ shelltools.makedirs("build")
+ shelltools.cd("build")
+ #shelltools.system("../scripts/update_deps.py")
+ validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
-DCMAKE_ASM_FLAGS='--32' \
"
-
- cmaketools.configure(validation_opts)
-
- else:
- shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
-
- loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
- "
-
- cmaketools.configure(loader_opts)
-
- shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
- shelltools.system("scripts/update_deps.py")
-
- validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
- "
-
- cmaketools.configure(validation_opts)
-
-
+
+ cmaketools.configure(validation_opts, sourceDir="..")
+
+ else:
+ shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
+ shelltools.makedirs("build")
+ shelltools.cd("build")
+
+ loader_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
+ "
+
+ cmaketools.configure(loader_opts, sourceDir="..")
+
+ shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
+ shelltools.makedirs("build")
+ shelltools.cd("build")
+ #shelltools.system("../scripts/update_deps.py")
+
+ validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
+ "
+
+ cmaketools.configure(validation_opts, sourceDir="..")
+
def build():
- shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
- cmaketools.make()
-
- shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
- cmaketools.make()
+ shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
+ shelltools.cd("build")
+ cmaketools.make()
+
+ shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
+ shelltools.cd("build")
+ cmaketools.make()
-
def install():
- shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
- autotools.rawInstall("DESTDIR=%s" %get.installDIR())
-
- shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
- autotools.rawInstall("DESTDIR=%s" %get.installDIR())
-
+ shelltools.cd("%s/Vulkan-Loader-%s" %(get.workDIR(), ver))
+ shelltools.cd("build")
+ autotools.rawInstall("DESTDIR=%s" %get.installDIR())
+
+ shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
+ shelltools.cd("build")
+ 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 5522ab3c1d..980369fd0a 100755
--- a/x11/vulkan/vulkan/pspec.xml
+++ b/x11/vulkan/vulkan/pspec.xml
@@ -12,67 +12,84 @@
library
Vulkan headers, loaders and validations layers
Vulkan headers, loaders and validations layers
- https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.1.130.tar.gz
- https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.1.130.tar.gz
-
- python3-lxml
- libX11-devel
- libXrandr-devel
- wayland-devel
- vulkan-headers
- cmake
- git
-
+ https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.2.146.tar.gz
+ https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.146.tar.gz
+
+ python3-lxml
+ libX11-devel
+ libXrandr-devel
+ wayland-devel
+ vulkan-headers
+ cmake
+ git
+
+ spirv-headers
+ glslang-devel
+ wayland-server
+ wayland-client
+ wayland-cursor
+ spirv-tools-devel
+
vulkan
-
- libX11
- libXrandr
- wayland
-
+
+ libX11
+ libXrandr
+ wayland
+ spirv-tools
+
/usr/bin
- /usr/lib
+ /usr/lib
/usr/share
- /usr/share/doc
+ /usr/share/doc
- vulkan-32bit
- _emul32
- emul32
-
- libX11-32bit
- libXrandr-32bit
- wayland-32bit
-
-
- libX11-32bit
- libXrandr-32bit
- wayland-32bit
-
+ vulkan-32bit
+ _emul32
+ emul32
+
+ libX11-32bit
+ libXrandr-32bit
+ wayland-32bit
+ spirv-tools-32bit
+
+
+ libX11-32bit
+ libXrandr-32bit
+ wayland-32bit
+ spirv-tools-32bit
+
- /usr/bin/*32
- /usr/lib32
+ /usr/bin/*32
+ /usr/lib32
vulkan-devel
- vulkan
-
+ vulkan
+
- /usr/include
- /usr/lib/pkgconfig
- /usr/lib32/pkgconfig
+ /usr/include
+ /usr/lib/pkgconfig
+ /usr/lib32/pkgconfig
+
+ 2020-07-13
+ 1.2.146
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2020-01-11
1.1.130