diff --git a/packages/graphics/vulkan/glslang/package.mk b/packages/graphics/vulkan/glslang/package.mk index 39428be9a1..9c0d47caca 100644 --- a/packages/graphics/vulkan/glslang/package.mk +++ b/packages/graphics/vulkan/glslang/package.mk @@ -6,8 +6,8 @@ PKG_NAME="glslang" # The SPIRV-Tools & SPIRV-Headers pkg_version/s need to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-tools & spirv-headers pkg_version/s. -PKG_VERSION="13.1.1" -PKG_SHA256="1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66" +PKG_VERSION="14.0.0" +PKG_SHA256="80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/glslang" PKG_URL="https://github.com/KhronosGroup/glslang/archive/${PKG_VERSION}.tar.gz" @@ -23,8 +23,7 @@ PKG_CMAKE_OPTS_COMMON="-DBUILD_EXTERNAL=ON \ -DENABLE_EXCEPTIONS=OFF \ -DENABLE_OPT=ON \ -DENABLE_PCH=ON \ - -DENABLE_CTEST=OFF \ - -DUSE_CCACHE=ON \ + -DGLSLANG_TESTS=OFF \ -Wno-dev" post_unpack() { diff --git a/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch b/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch index adde65d169..ab3ac57c9a 100644 --- a/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch +++ b/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch @@ -4,31 +4,9 @@ if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") -- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) +- add_subdirectory(spirv-tools) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Disable build shared libs" FORCE) -+ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools EXCLUDE_FROM_ALL) ++ add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) endif() endif() ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -100,7 +100,7 @@ if(ENABLE_OPT) - target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC - $ -- $) -+ $) - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif() ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -83,7 +83,7 @@ endif() - target_link_libraries(glslangValidator ${LIBRARIES}) - target_include_directories(glslangValidator PUBLIC - $ -- $) -+ $) - - if(ENABLE_OPT) - target_include_directories(glslangValidator