Version: 1.0.32.0, drop extra sources and icd

[packages/vulkan-sdk.git] / system_glslang_and_spirv-tools.patch

diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt VulkanTools-sdk-1.0.32.0/CMakeLists.txt
--- VulkanTools-sdk-1.0.32.0.orig/CMakeLists.txt	2016-11-10 18:52:27.000000000 +0100
+++ VulkanTools-sdk-1.0.32.0/CMakeLists.txt	2016-11-23 14:15:38.000000000 +0100
@@ -189,7 +189,7 @@
 else()
     #non windows
     if(CUSTOM_GLSLANG_BIN_ROOT)
-        set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
+	set (GLSLANG_SEARCH_PATH "${GLSLANG_BINARY_ROOT}/install/lib"
                                  "${GLSLANG_BINARY_ROOT}/glslang"
                                  "${GLSLANG_BINARY_ROOT}/glslang/OSDependent/Unix"
                                  "${GLSLANG_BINARY_ROOT}/OGLCompilersDLL"
@@ -197,26 +197,27 @@
                                  "${GLSLANG_BINARY_ROOT}/hlsl"
                                  "${GLSLANG_BINARY_ROOT}/StandAlone")
     else()
-        set (GLSLANG_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
+	set (GLSLANG_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/glslang/${BUILDTGT_DIR}/install/lib" "${CMAKE_SOURCE_DIR}/../x86_64/lib/glslang" )
     endif()
 
     if(CUSTOM_SPIRV_TOOLS_BIN_ROOT)
         set (SPIRV_TOOLS_SEARCH_PATH "${SPIRV_TOOLS_BINARY_ROOT}/source" )
     else()
-        set (SPIRV_TOOLS_SEARCH_PATH "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
+        set (SPIRV_TOOLS_SEARCH_PATH "${CMAKE_INSTALL_LIBDIR}" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/${BUILDTGT_DIR}/source" "${CMAKE_SOURCE_DIR}/../x86_64/lib/spirv-tools" )
     endif()
 endif()
 
 find_program(GLSLANG_VALIDATOR NAMES glslangValidator
-             HINTS "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
+             HINTS "/usr/bin"
+	           "${CMAKE_SOURCE_DIR}/external/glslang/${BUILDTGT_DIR}/install/bin"
                    "${GLSLANG_BINARY_ROOT}/StandAlone"
                    "${PROJECT_SOURCE_DIR}/external/${BINDATA_DIR}")
 
-find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "${EXTERNAL_SOURCE_ROOT}/glslang"
+find_path(GLSLANG_SPIRV_INCLUDE_DIR SPIRV/spirv.hpp HINTS "/usr/include/glslang" "${EXTERNAL_SOURCE_ROOT}/glslang"
                                                     "${CMAKE_SOURCE_DIR}/../glslang"
                                               DOC "Path to SPIRV/spirv.hpp")
 
-find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
+find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "/usr/include" "${EXTERNAL_SOURCE_ROOT}/spirv-tools/include"
                                                    "${EXTERNAL_SOURCE_ROOT}/SPIRV-Tools/include"
                                                    "${CMAKE_SOURCE_DIR}/../spirv-tools/include"
                                                    "${CMAKE_SOURCE_DIR}/../SPIRV-Tools/include"
diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt VulkanTools-sdk-1.0.32.0/demos/smoke/CMakeLists.txt
--- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/CMakeLists.txt	2016-11-10 18:52:27.000000000 +0100
+++ VulkanTools-sdk-1.0.32.0/demos/smoke/CMakeLists.txt	2016-11-23 14:15:38.000000000 +0100
@@ -10,7 +10,7 @@
 macro(glsl_to_spirv src)
     add_custom_command(OUTPUT ${src}.h
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
         )
 endmacro()
 
diff -dur -x '*.orig' VulkanTools-sdk-1.0.32.0.orig/demos/smoke/glsl-to-spirv VulkanTools-sdk-1.0.32.0/demos/smoke/glsl-to-spirv
--- VulkanTools-sdk-1.0.32.0.orig/demos/smoke/glsl-to-spirv	2016-11-10 18:52:27.000000000 +0100
+++ VulkanTools-sdk-1.0.32.0/demos/smoke/glsl-to-spirv	2016-11-23 14:15:38.000000000 +0100
@@ -32,7 +32,7 @@
 in_filename = sys.argv[1]
 out_filename = sys.argv[2] if len(sys.argv) > 2 else None
 validator = sys.argv[3] if len(sys.argv) > 3 else \
-        "../../../glslang/build/install/bin/glslangValidator"
+        "glslangValidator"
 
 def identifierize(s):
     # translate invalid chars