[spirv-cross,spirv-headers,spirv-tools] 2021-01-15 update (#15831)

* update spiv-{cross,tools,headers}

* update spriv-{cross,headers,tools} versions

* update versions

* fixup the C targets

* bump headers and remove shared lib from spirv-tools

* update versions.

* added fixup pkg-config

* update git version hash.

* format manifests

* git-trees

* Update ports/spirv-headers/vcpkg.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/spirv-tools/portfile.cmake

* Update ports/spirv-cross/vcpkg.json

* update verson record

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

13 files changed, 42 insertions, 56 deletions

diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake
index 42fa3b234..adb96cd40 100644
--- a/ports/spirv-cross/portfile.cmake
+++ b/ports/spirv-cross/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Cross
-    REF 2020-02-26
-    SHA512 96e4c7d8bf8603d061d1a7afac34db044842dede65f2d9328da1d99a3c8aed9f6fd64fd611e8d1618bd937b682b377d87304a4fcc9068bcffed3d275cb4dfe2c
+    REF 2021-01-15
+    SHA512 f934ef61602223f6fe6d9c826ed5beb129beb7a30b18b389625d4fc0b1efa1b8df930a2a2d2a0b4f377ef2899e8e034239819a4c6629a78c666f72004464da93
     HEAD_REF master
 )
 
@@ -22,12 +22,14 @@ vcpkg_configure_cmake(
     OPTIONS
         -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF
         -DSPIRV_CROSS_CLI=${BUILD_CLI}
+        -DSPIRV_CROSS_SKIP_INSTALL=OFF
+        -DSPIRV_CROSS_ENABLE_C_API=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-foreach(COMPONENT core cpp glsl hlsl msl reflect util)
+foreach(COMPONENT core c cpp glsl hlsl msl reflect util)
     vcpkg_fixup_cmake_targets(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake TARGET_PATH share/spirv_cross_${COMPONENT})
 endforeach()
 
diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json
index 61fe79d13..86c3ff3de 100644
--- a/ports/spirv-cross/vcpkg.json
+++ b/ports/spirv-cross/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "spirv-cross",
-  "version-string": "2020-02-26",
-  "port-version": 1,
+  "version-date": "2021-01-15",
   "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
   "dependencies": [
diff --git a/ports/spirv-headers/CONTROL b/ports/spirv-headers/CONTROL
deleted file mode 100644
index 8a6051d13..000000000
--- a/ports/spirv-headers/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: spirv-headers
-Version: 1.5.1
-Homepage: https://github.com/KhronosGroup/SPIRV-Headers
-Description: Machine-readable files for the SPIR-V Registry
diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake
index d94e16484..2256792e9 100644
--- a/ports/spirv-headers/portfile.cmake
+++ b/ports/spirv-headers/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Headers
-    REF 1.5.1.corrected
-    SHA512 92447b1b1eca6f0253265f36d67b00c0c79e93f6a707e27bd8239bd2f693c468a92b7f7c3bb3fde6bb091383baaff42d3b0bbfeb9ff5f952d8a0b9626b03848e
+    REF bcf55210f13a4fa3c3d0963b509ff1070e434c79
+    SHA512 d0553b95f28b77209862059cd0a8c15ca3340f33e13d9bb75340ced07a5aa07b8b9eaa1bdc42daa0dbf78679c3b1ef3d344c73b17518061249cdc67000568c37
     HEAD_REF master
 )
 
diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json
new file mode 100644
index 000000000..53093e4ff
--- /dev/null
+++ b/ports/spirv-headers/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "spirv-headers",
+  "version-date": "2021-03-25",
+  "description": "Machine-readable files for the SPIR-V Registry",
+  "homepage": "https://github.com/KhronosGroup/SPIRV-Headers"
+}
diff --git a/ports/spirv-tools/cmake-install.patch b/ports/spirv-tools/cmake-install.patch
index ce5992c89..ef21cb8f0 100644
--- a/ports/spirv-tools/cmake-install.patch
+++ b/ports/spirv-tools/cmake-install.patch
@@ -21,16 +21,3 @@ index 6ed56a8..66d1e66 100644
  

    macro(spvtools_generate_config_file TARGET)

      file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake

-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt

-index 4e7e10c..278e439 100644

---- a/source/CMakeLists.txt

-+++ b/source/CMakeLists.txt

-@@ -387,7 +387,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")

- endif()

- 

- if(ENABLE_SPIRV_TOOLS_INSTALL)

--  install(TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared EXPORT ${SPIRV_TOOLS}Targets

-+  install(TARGETS ${SPIRV_TOOLS} EXPORT ${SPIRV_TOOLS}Targets

-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/ports/spirv-tools/comment-distutils.patch b/ports/spirv-tools/comment-distutils.patch
deleted file mode 100644
index 1ec4e9dcb..000000000
--- a/ports/spirv-tools/comment-distutils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/utils/generate_registry_tables.py b/utils/generate_registry_tables.py

-index e662ba9..49f2718 100644

---- a/utils/generate_registry_tables.py

-+++ b/utils/generate_registry_tables.py

-@@ -14,7 +14,7 @@

- # limitations under the License.

- """Generates the vendor tool table from the SPIR-V XML registry."""

- 

--import distutils.dir_util

-+#import distutils.dir_util

- import os.path

- import xml.etree.ElementTree

- 

-@@ -62,7 +62,7 @@ def main():

-     with open(args.xml) as xml_in:

-        registry = xml.etree.ElementTree.fromstring(xml_in.read())

- 

--    distutils.dir_util.mkpath(os.path.dirname(args.generator_output))

-+    #distutils.dir_util.mkpath(os.path.dirname(args.generator_output))

-     with open(args.generator_output, 'w') as f:

-       f.write(generate_vendor_table(registry))

- 

diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake
index e72d179f9..8304148a9 100644
--- a/ports/spirv-tools/portfile.cmake
+++ b/ports/spirv-tools/portfile.cmake
@@ -4,10 +4,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Tools
-    REF v2020.1
-    SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46
+    REF v2020.7
+    SHA512 34d870e5aaaa2ad744369521efd43bdfba5e47208bb31bc0e325322e3a6edbe7686d3f4d9a6ebff6e85625e1a00811ab0162e2b8f39dd18603b7ff6548897950
     PATCHES
-        comment-distutils.patch
         cmake-install.patch
         install-config-typo.patch
 )
@@ -33,6 +32,7 @@ vcpkg_configure_cmake(
         -DSPIRV_WERROR=OFF
         -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} # option SPIRV_SKIP_TESTS follows this value
         -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL}
+        -DSPIRV_TOOLS_BUILD_STATIC=ON
 )
 
 vcpkg_install_cmake()
@@ -40,10 +40,14 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools TARGET_PATH share/SPIRV-
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-link TARGET_PATH share/SPIRV-Tools-link)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-opt TARGET_PATH share/SPIRV-Tools-opt)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-reduce TARGET_PATH share/SPIRV-Tools-reduce)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # only static linkage, i.e. no need to preserve .dll/.so files
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/SPIRV-Tools-shared.dll")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libSPIRV-Tools-shared.so")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libSPIRV-Tools-shared.so")
 if(TOOLS_INSTALL)
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json
index 44af534b5..b79dd566b 100644
--- a/ports/spirv-tools/vcpkg.json
+++ b/ports/spirv-tools/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "spirv-tools",
-  "version-string": "2020.1",
-  "port-version": 2,
+  "version-string": "2020.7",
   "description": "API and commands for processing SPIR-V modules",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index a90c93948..f7766e91f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5737,16 +5737,16 @@
       "port-version": 0
     },
     "spirv-cross": {
-      "baseline": "2020-02-26",
-      "port-version": 1
+      "baseline": "2021-01-15",
+      "port-version": 0
     },
     "spirv-headers": {
-      "baseline": "1.5.1",
+      "baseline": "2021-03-25",
       "port-version": 0
     },
     "spirv-tools": {
-      "baseline": "2020.1",
-      "port-version": 2
+      "baseline": "2020.7",
+      "port-version": 0
     },
     "sprout": {
       "baseline": "2019-06-20",
diff --git a/versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json
index 6e976be29..c3a51b33d 100644
--- a/versions/s-/spirv-cross.json
+++ b/versions/s-/spirv-cross.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "c9d976a350220005632d3c23ff714e0cf267b836",
+      "version-date": "2021-01-15",
+      "port-version": 0
+    },
+    {
       "git-tree": "7ad1238ca2e8ac10608f992a317ee3108ddb3272",
       "version-string": "2020-02-26",
       "port-version": 1
diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json
index b2553fbfc..4922cc971 100644
--- a/versions/s-/spirv-headers.json
+++ b/versions/s-/spirv-headers.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "28d7c25f7908e3ac693c769c3ce6474855a05bcb",
+      "version-date": "2021-03-25",
+      "port-version": 0
+    },
+    {
       "git-tree": "24a883021f92092b645b516dde1489ea0f8e2665",
       "version-string": "1.5.1",
       "port-version": 0
diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json
index ef4c3795d..f073519fc 100644
--- a/versions/s-/spirv-tools.json
+++ b/versions/s-/spirv-tools.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "03084f48c2608e410a438662bab2a68ab92a5c95",
+      "version-string": "2020.7",
+      "port-version": 0
+    },
+    {
       "git-tree": "cebc581ce190b91f63b06fd7a4807ef1cc2b9c52",
       "version-string": "2020.1",
       "port-version": 2