From 16f5ba45a9be82a05c3c5a45b729516cb0f26bbd Mon Sep 17 00:00:00 2001 From: Gabe Rundlett Date: Mon, 12 Sep 2022 14:43:31 -0600 Subject: [PATCH] [glslang] Bump version to 11.11.0 (#26671) * Bump glslang port to 11.11.0 * Fix sha to match the one shown on the microsoft build server * Fix portfile issues (at least for Windows) * Potentially fix shaderc port * update shaderc version * shaderc appears to require Threads? * change shaderc port version? * fix local port-version * Added custom usage as per PR suggestion! * Updated glslang port tree version hash --- .../always-install-resource-limits.patch | 13 ------------ ports/glslang/glslang-config.cmake | 7 ------- ports/glslang/portfile.cmake | 15 ++++--------- ports/glslang/usage | 4 ++++ ports/glslang/vcpkg.json | 2 +- ports/shaderc/glslang/CMakeLists.txt | 21 +++++++++++++------ ports/shaderc/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/g-/glslang.json | 5 +++++ versions/s-/shaderc.json | 5 +++++ 10 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 ports/glslang/always-install-resource-limits.patch delete mode 100644 ports/glslang/glslang-config.cmake create mode 100644 ports/glslang/usage diff --git a/ports/glslang/always-install-resource-limits.patch b/ports/glslang/always-install-resource-limits.patch deleted file mode 100644 index 56c34dfc44..0000000000 --- a/ports/glslang/always-install-resource-limits.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 751d1cd71..0f5cf0dc0 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) - install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - -- if(BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS OR TRUE) - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/glslang/glslang-config.cmake b/ports/glslang/glslang-config.cmake deleted file mode 100644 index 5eb356151f..0000000000 --- a/ports/glslang/glslang-config.cmake +++ /dev/null @@ -1,7 +0,0 @@ -include(CMakeFindDependencyMacro) - -find_dependency(Threads) - -foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper) - include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL) -endforeach() diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index e153195dca..90620f64b5 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 11.8.0 - SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 + REF 11.11.0 + SHA512 c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd HEAD_REF master PATCHES ignore-crt.patch - always-install-resource-limits.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -43,13 +42,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/bin") -if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake") - message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") -endif() - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glslang/usage b/ports/glslang/usage new file mode 100644 index 0000000000..795414824a --- /dev/null +++ b/ports/glslang/usage @@ -0,0 +1,4 @@ +The package glslang provides CMake targets: + + find_package(glslang CONFIG REQUIRED) + target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OGLCompiler glslang::glslangValidator glslang::spirv-remap glslang::glslang-default-resource-limits glslang::SPVRemapper glslang::SPIRV glslang::HLSL) \ No newline at end of file diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index b09ee8dedb..1642c12981 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "11.8.0", + "version": "11.11.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "dependencies": [ diff --git a/ports/shaderc/glslang/CMakeLists.txt b/ports/shaderc/glslang/CMakeLists.txt index 0e745779db..3b31564f9f 100644 --- a/ports/shaderc/glslang/CMakeLists.txt +++ b/ports/shaderc/glslang/CMakeLists.txt @@ -2,12 +2,21 @@ cmake_minimum_required(VERSION 3.11) find_package(glslang CONFIG REQUIRED) -set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) + +add_library(glslang ALIAS glslang::glslang) +add_library(OSDependent ALIAS glslang::OSDependent) +add_library(OGLCompiler ALIAS glslang::OGLCompiler) +add_library(HLSL ALIAS glslang::HLSL) +add_library(SPIRV ALIAS glslang::SPIRV) +add_library(MachineIndependent ALIAS glslang::MachineIndependent) + +find_package(Threads REQUIRED) find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index 903544d805..b3c400f80c 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 2, + "port-version": 3, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 57a3709c0b..593878e909 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,7 +2641,7 @@ "port-version": 0 }, "glslang": { - "baseline": "11.8.0", + "baseline": "11.11.0", "port-version": 0 }, "glui": { @@ -6686,7 +6686,7 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 2 + "port-version": 3 }, "shaderwriter": { "baseline": "2.4.0", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 2d97b899d6..f2868c3537 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011", + "version": "11.11.0", + "port-version": 0 + }, { "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", "version": "11.8.0", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 840e9fe991..768c339602 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d93e78fd464f2f378c8faf94e40e16410e1c41e0", + "version": "2021.1", + "port-version": 3 + }, { "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", "version": "2021.1",