diff --git a/ports/vsg/devendor-glslang.patch b/ports/vsg/devendor-glslang.patch deleted file mode 100644 index fcfa8395c8..0000000000 --- a/ports/vsg/devendor-glslang.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85d18322..0ad18049 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,13 +36,14 @@ endif() - find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED) - - find_package(Threads REQUIRED) -+find_package(glslang CONFIG REQUIRED) - - # Set the instrumentation level to compile into sources - set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level to build into the VSG ibrary, 0 for off, 1 coarse grained, 2 medium, 3 fine grained." ) - - # Enable/disable shader compilation support that pulls in glslang - set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." ) --if (VSG_SUPPORTS_ShaderCompiler) -+if (FALSE) - if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/glslang/build_vars.cmake) - - if (Git_FOUND) -diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt -index 36597e0f..9f8cd47e 100644 ---- a/src/vsg/CMakeLists.txt -+++ b/src/vsg/CMakeLists.txt -@@ -254,7 +254,7 @@ set(SOURCES - utils/Profiler.cpp - ) - --if (${VSG_SUPPORTS_ShaderCompiler}) -+if (FALSE) - - # include glslang source code directly into the VulkanScenegraph library build. - include(../glslang/build_vars.cmake) -@@ -264,6 +264,10 @@ endif() - set(LIBRARIES PUBLIC - Vulkan::Vulkan - Threads::Threads -+ PRIVATE -+ glslang::glslang -+ glslang::glslang-default-resource-limits -+ glslang::SPIRV - ) - - # Check for std::atomic -@@ -402,9 +406,6 @@ target_include_directories(vsg - PUBLIC - $ - $ -- PRIVATE -- $ -- $ - ) - - target_link_libraries(vsg ${LIBRARIES}) -diff --git a/src/vsg/utils/ShaderCompiler.cpp b/src/vsg/utils/ShaderCompiler.cpp -index a8f8dec9..2ca86f87 100644 ---- a/src/vsg/utils/ShaderCompiler.cpp -+++ b/src/vsg/utils/ShaderCompiler.cpp -@@ -20,7 +20,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI - #include - - #if VSG_SUPPORTS_ShaderCompiler --# include -+# include - # include - # include - #endif -diff --git a/src/vsg/vsgConfig.cmake.in b/src/vsg/vsgConfig.cmake.in -index 7ea0de02..4f7e77bd 100644 ---- a/src/vsg/vsgConfig.cmake.in -+++ b/src/vsg/vsgConfig.cmake.in -@@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro) - - find_package(Vulkan @Vulkan_MIN_VERSION@ REQUIRED) - find_dependency(Threads) -+find_dependency(glslang) - - @FIND_DEPENDENCY_WINDOWING@ - include("${CMAKE_CURRENT_LIST_DIR}/vsgTargets.cmake") diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index fa152548a2..4e2633d1b6 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vsg-dev/VulkanSceneGraph REF "v${VERSION}" - SHA512 01502b0f812b3325dcb95511ea61f7c64bb476d7644f79f05b0106cf14a6442235f1d7ecb4d604b1668d99ca01db804d241dd4bbab7cad48307b03bc35cce4d1 + SHA512 a9a1d2f82badc393b7be8db9616ef6bd5fa74cd65f83dd65d7d7344b61eb9d52d24f34de71f98f2de1a5bd4c41c7aae5e538a4f58346ff1a9ec5108cbef759cf HEAD_REF master - PATCHES devendor-glslang.patch ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index 44048b29bd..406d0f7437 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vsg", - "version": "1.1.2", + "version": "1.1.7", "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6c45754f53..43475cee1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9333,7 +9333,7 @@ "port-version": 2 }, "vsg": { - "baseline": "1.1.2", + "baseline": "1.1.7", "port-version": 0 }, "vsgimgui": { diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index ae0f5ff968..e8a7bac975 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48", + "version": "1.1.7", + "port-version": 0 + }, { "git-tree": "7b85c33c8bf83e25afe90f8f02dbd5dd5c77bed5", "version": "1.1.2",