From ba29293726646a046dee6e664860f83359550896 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Mon, 13 Jul 2020 19:53:30 +0000
Subject: [PATCH] vulkan rebuild

---
 x11/vulkan/vulkan/actions.py | 8 +++-----
 x11/vulkan/vulkan/pspec.xml  | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/x11/vulkan/vulkan/actions.py b/x11/vulkan/vulkan/actions.py
index 320d9abb5f..1bcbec36d8 100755
--- a/x11/vulkan/vulkan/actions.py
+++ b/x11/vulkan/vulkan/actions.py
@@ -36,10 +36,8 @@ def setup():
                         -DBUILD_WSI_WAYLAND_SUPPORT=On \
                         -DBUILD_SHARED_LIBS=ON \
                         -DBUILD_LAYER_SUPPORT_FILES=ON \
-                        -DSPIRV_TOOLS_LIB=/usr \
-                        -DSPIRV_TOOLS_OPT_LIB=/usr \
                         -DSPIRV_HEADERS_INSTALL_DIR=/usr \
-                        -DGLSLANG_INSTALL_DIR=/usr \
+                        -DGLSLANG_INSTALL_DIR=glslang/build/install \
                       "
                       
     if get.buildTYPE() == "_emul32":
@@ -61,7 +59,7 @@ def setup():
         shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
         shelltools.makedirs("build")
         shelltools.cd("build")
-        #shelltools.system("../scripts/update_deps.py")
+        shelltools.system("../scripts/update_deps.py")
         validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib32 \
                             -DCMAKE_ASM_FLAGS='--32' \
                            "
@@ -81,7 +79,7 @@ def setup():
         shelltools.cd("%s/Vulkan-ValidationLayers-%s" %(get.workDIR(), ver))
         shelltools.makedirs("build")
         shelltools.cd("build")
-        #shelltools.system("../scripts/update_deps.py")
+        shelltools.system("../scripts/update_deps.py")
         
         validation_opts += "-DCMAKE_INSTALL_LIBDIR=lib \
                            "
diff --git a/x11/vulkan/vulkan/pspec.xml b/x11/vulkan/vulkan/pspec.xml
index 980369fd0a..1e372763b0 100755
--- a/x11/vulkan/vulkan/pspec.xml
+++ b/x11/vulkan/vulkan/pspec.xml
@@ -24,11 +24,11 @@
             <Dependency>git</Dependency>
             
             <Dependency>spirv-headers</Dependency>
-            <Dependency>glslang-devel</Dependency>
+<!--             <Dependency>glslang-devel</Dependency> -->
             <Dependency>wayland-server</Dependency>
             <Dependency>wayland-client</Dependency>
             <Dependency>wayland-cursor</Dependency>
-            <Dependency>spirv-tools-devel</Dependency>
+<!--             <Dependency>spirv-tools-devel</Dependency> -->
         </BuildDependencies>
     </Source>
 
@@ -56,7 +56,7 @@
             <Dependency>libX11-32bit</Dependency>
             <Dependency>libXrandr-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
-            <Dependency>spirv-tools-32bit</Dependency>
+<!--             <Dependency>spirv-tools-32bit</Dependency> -->
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>libX11-32bit</Dependency>