[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>

4 files changed, 8 insertions, 40 deletions

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": [