Shaderc 2025.2 (#45233)

2025-04-26 03:44:54 +09:00 · 2025-04-26 03:44:54 +09:00 · 335eb3b797
parent a0c0139ab6
commit 335eb3b797
7 changed files with 49 additions and 92 deletions
--- a/ports/shaderc/cmake-project-include.cmake
+++ b/ports/shaderc/cmake-project-include.cmake
@ -1,14 +1,17 @@
 set(SHADERC_GLSLANG_DIR "" CACHE STRING "unused")
-find_package(glslang CONFIG REQUIRED)
-add_library(glslang ALIAS glslang::glslang)
-add_library(MachineIndependent ALIAS glslang::MachineIndependent)
-add_library(OSDependent ALIAS glslang::OSDependent)
-add_library(SPIRV ALIAS glslang::SPIRV)
-
+if (NOT TARGET glslang)
+  find_package(glslang CONFIG REQUIRED)
+  add_library(glslang ALIAS glslang::glslang)
+  add_library(MachineIndependent ALIAS glslang::MachineIndependent)
+  add_library(OSDependent ALIAS glslang::OSDependent)
+  add_library(SPIRV ALIAS glslang::SPIRV)
+endif()
 find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h REQUIRED)
 set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE)

 set(SHADERC_SPIRV_TOOLS_DIR "" CACHE STRING "unused")
-find_package(SPIRV-Tools CONFIG REQUIRED)
-add_library(SPIRV-Tools ALIAS SPIRV-Tools-static) # as linked by SPIRV-Tools-opt
-find_package(SPIRV-Tools-opt CONFIG REQUIRED)
+if (NOT TARGET SPIRV-Tools)
+  find_package(SPIRV-Tools CONFIG REQUIRED)
+  add_library(SPIRV-Tools ALIAS SPIRV-Tools-static) # as linked by SPIRV-Tools-opt
+  find_package(SPIRV-Tools-opt CONFIG REQUIRED)
+endif()
--- a/ports/shaderc/disable-update-version.patch
+++ b/ports/shaderc/disable-update-version.patch
@ -1,28 +1,29 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 075641e..b2e92ef 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,11 +129,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
-     add_subdirectory(examples)
- endif()
- 
-add_custom_target(build-version
-  ${PYTHON_EXECUTABLE}
-  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
-  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
- 
- function(define_pkg_config_file NAME LIBS)
-   add_custom_target(${NAME}-pkg-config ALL
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index c8fa6d5..341865a 100644
--- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
- target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
- set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
- target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
-add_dependencies(glslc_exe build-version)
- 
- shaderc_add_tests(
-   TEST_PREFIX glslc
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd6b890..0b55f77 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -129,12 +129,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
+     add_subdirectory(examples)
+ endif()
+ 
+-add_custom_target(build-version
+-  ${Python_EXECUTABLE}
+-  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
+-  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
+-
+ function(define_pkg_config_file NAME LIBS)
+   add_custom_target(${NAME}-pkg-config ALL
+     COMMAND ${CMAKE_COMMAND}
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index 1277d87..e431761 100644
+--- a/glslc/CMakeLists.txt
+++ b/glslc/CMakeLists.txt
+@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
+ target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
+ set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
+ target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
+-add_dependencies(glslc_exe build-version)
+ 
+ shaderc_add_tests(
+   TEST_PREFIX glslc
--- a/ports/shaderc/fix-python.patch
+++ b/ports/shaderc/fix-python.patch
@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75660ca..fa1ee84 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,14 +99,14 @@ endif ()
- 
- if (SHADERC_ENABLE_COPYRIGHT_CHECK)
-   add_custom_target(check-copyright ALL
-    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
-+    ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
-     --check
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-     COMMENT "Check copyright")
- endif()
- 
- add_custom_target(add-copyright
-  ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
-+  ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
-   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-   COMMENT "Add copyright")
- 
-diff --git a/utils/add_copyright.py b/utils/add_copyright.py
-index ab3c5f1..7ea0897 100755
--- a/utils/add_copyright.py
-+++ b/utils/add_copyright.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- # Copyright 2015 The Shaderc Authors. All rights reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
-diff --git a/utils/remove-file-by-suffix.py b/utils/remove-file-by-suffix.py
-index 39af161..ce7c658 100755
--- a/utils/remove-file-by-suffix.py
-+++ b/utils/remove-file-by-suffix.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Copyright 2015 The Shaderc Authors. All rights reserved.
- #
-diff --git a/utils/update_build_version.py b/utils/update_build_version.py
-index 11ee53e..b7ce5b8 100755
--- a/utils/update_build_version.py
-+++ b/utils/update_build_version.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Copyright 2016 The Shaderc Authors. All rights reserved.
- #
--- a/ports/shaderc/portfile.cmake
+++ b/ports/shaderc/portfile.cmake
@ -5,13 +5,12 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/shaderc
    REF "v${VERSION}"
-    SHA512 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf
+    SHA512 6761372591075944fddd926e9f7c2ea9447496566d2d549f523c6c529c3bd753d459b66d499f76d955bdcfb335016daddbeba49b087f4ecabf37d76a46ac14cd
    HEAD_REF master
    PATCHES 
        disable-update-version.patch
        fix-build-type.patch
        cmake-config-export.patch
-        fix-python.patch # Upstream PRs #1389 and #1401.
 )

 file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src")
--- a/ports/shaderc/vcpkg.json
+++ b/ports/shaderc/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "shaderc",
-  "version": "2023.8",
+  "version": "2025.2",
  "description": "A collection of tools, libraries and tests for shader compilation.",
  "homepage": "https://github.com/google/shaderc",
  "license": "Apache-2.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -8589,7 +8589,7 @@
      "port-version": 0
    },
    "shaderc": {
-      "baseline": "2023.8",
+      "baseline": "2025.2",
      "port-version": 0
    },
    "shaderwriter": {
--- a/versions/s-/shaderc.json
+++ b/versions/s-/shaderc.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1f5d61fa5ce03d0f578908c8a7a8bb22c3aa298c",
+      "version": "2025.2",
+      "port-version": 0
+    },
    {
      "git-tree": "2e5657c38583dba408c16a4d1cc7f624d01d7d3b",
      "version": "2023.8",