Merge branch 'master' into vcpkg_nuget

4 files changed, 36 insertions, 42 deletions

diff --git a/ports/spirv-tools/CMake-targets.patch b/ports/spirv-tools/CMake-targets.patch
index 6b754e16b..d3870f8c8 100644
--- a/ports/spirv-tools/CMake-targets.patch
+++ b/ports/spirv-tools/CMake-targets.patch
@@ -1,8 +1,8 @@
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 2d7d7ca..bf77be7 100644
+index 1f96018..c9a3758 100644
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -327,31 +327,41 @@ set_source_files_properties(
+@@ -337,7 +337,7 @@ spvtools_pch(SPIRV_SOURCES pch_source)
  add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
  spvtools_default_compile_options(${SPIRV_TOOLS})
  target_include_directories(${SPIRV_TOOLS}
@@ -11,37 +11,8 @@ index 2d7d7ca..bf77be7 100644
    PRIVATE ${spirv-tools_BINARY_DIR}
    PRIVATE ${SPIRV_HEADER_INCLUDE_DIR}
    )
- set_property(TARGET ${SPIRV_TOOLS} PROPERTY FOLDER "SPIRV-Tools libraries")
- spvtools_check_symbol_exports(${SPIRV_TOOLS})
- 
--add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
--spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
--target_include_directories(${SPIRV_TOOLS}-shared
--  PUBLIC ${spirv-tools_SOURCE_DIR}/include
--  PRIVATE ${spirv-tools_BINARY_DIR}
--  PRIVATE ${SPIRV_HEADER_INCLUDE_DIR}
--  )
--set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
--set_property(TARGET ${SPIRV_TOOLS}-shared PROPERTY FOLDER "SPIRV-Tools libraries")
--spvtools_check_symbol_exports(${SPIRV_TOOLS}-shared)
--target_compile_definitions(${SPIRV_TOOLS}-shared
--  PRIVATE SPIRV_TOOLS_IMPLEMENTATION
--  PUBLIC SPIRV_TOOLS_SHAREDLIB
--)
-+# add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
-+# spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
-+# target_include_directories(${SPIRV_TOOLS}-shared
-+#   PUBLIC ${spirv-tools_SOURCE_DIR}/include
-+#   PRIVATE ${spirv-tools_BINARY_DIR}
-+#   PRIVATE ${SPIRV_HEADER_INCLUDE_DIR}
-+#   )
-+# set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
-+# set_property(TARGET ${SPIRV_TOOLS}-shared PROPERTY FOLDER "SPIRV-Tools libraries")
-+# spvtools_check_symbol_exports(${SPIRV_TOOLS}-shared)
-+# target_compile_definitions(${SPIRV_TOOLS}-shared
-+#   PRIVATE SPIRV_TOOLS_IMPLEMENTATION
-+#   PUBLIC SPIRV_TOOLS_SHAREDLIB
-+# )
+@@ -370,10 +370,20 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ endif()
  
  if(ENABLE_SPIRV_TOOLS_INSTALL)
 -  install(TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared
@@ -60,6 +31,8 @@ index 2d7d7ca..bf77be7 100644
 +    NAMESPACE spirv-tools::
 +  )
  endif(ENABLE_SPIRV_TOOLS_INSTALL)
+ 
+ if(MSVC)
 diff --git a/source/link/CMakeLists.txt b/source/link/CMakeLists.txt
 index 8ca4df3..ac0aa62 100644
 --- a/source/link/CMakeLists.txt
@@ -89,10 +62,10 @@ index 8ca4df3..ac0aa62 100644
 +  )
  endif(ENABLE_SPIRV_TOOLS_INSTALL)
 diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt
-index 854c950..fc91539 100644
+index b02485a..111ce3c 100644
 --- a/source/opt/CMakeLists.txt
 +++ b/source/opt/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_library(SPIRV-Tools-opt
+@@ -221,7 +221,7 @@ add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
  
  spvtools_default_compile_options(SPIRV-Tools-opt)
  target_include_directories(SPIRV-Tools-opt
@@ -101,7 +74,7 @@ index 854c950..fc91539 100644
    PUBLIC ${SPIRV_HEADER_INCLUDE_DIR}
    PRIVATE ${spirv-tools_BINARY_DIR}
  )
-@@ -171,9 +171,14 @@ set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
+@@ -233,8 +233,13 @@ set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
  spvtools_check_symbol_exports(SPIRV-Tools-opt)
  
  if(ENABLE_SPIRV_TOOLS_INSTALL)
@@ -116,4 +89,3 @@ index 854c950..fc91539 100644
 +    FILE "${CMAKE_CURRENT_BINARY_DIR}/spirv-tools-opt-config.cmake"
 +  )
  endif(ENABLE_SPIRV_TOOLS_INSTALL)
-     
diff --git a/ports/spirv-tools/CONTROL b/ports/spirv-tools/CONTROL
index b5f0c536a..154783ca2 100644
--- a/ports/spirv-tools/CONTROL
+++ b/ports/spirv-tools/CONTROL
@@ -1,5 +1,5 @@
 Source: spirv-tools

-Version: 2018.1-2

+Version: 2019.3-dev-1

 Homepage: https://github.com/KhronosGroup/SPIRV-Tools

 Description: API and commands for processing SPIR-V modules

-Build-Depends: spirv-headers

+Build-Depends: spirv-headers
\ No newline at end of file
diff --git a/ports/spirv-tools/comment-distutils.patch b/ports/spirv-tools/comment-distutils.patch
new file mode 100644
index 000000000..2426f82ba
--- /dev/null
+++ b/ports/spirv-tools/comment-distutils.patch
@@ -0,0 +1,22 @@
+diff --git a/utils/generate_registry_tables.py b/utils/generate_registry_tables.py

+index 8b1c3572..6ab28fe6 100644

+--- a/utils/generate_registry_tables.py

++++ b/utils/generate_registry_tables.py

+@@ -16,7 +16,7 @@

+ 

+ from __future__ import print_function

+ 

+-import distutils.dir_util

++#import distutils.dir_util

+ import os.path

+ import xml.etree.ElementTree

+ 

+@@ -64,7 +64,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))

+     print(generate_vendor_table(registry), file=open(args.generator_output, 'w'))

+ 

+ 

diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake
index 3011aa396..59cf97591 100644
--- a/ports/spirv-tools/portfile.cmake
+++ b/ports/spirv-tools/portfile.cmake
@@ -5,10 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Tools
-    REF v2018.1
-    SHA512 0637c413dafd931e8222f9bf70a024f8b64116f0300c7732b86bcaff321188a0e746f79c1385ae23a7692e83194586b57692960d5be607fb2d7960731b6cd63f
-    HEAD_REF master
+    REF d0a1f5a05a2b0f8315e5b3f17b8e34c730861b31
+    SHA512 7179751b0216368b4a4bf8c9b0c1c1e3b17d6aa4788b4aeaa7fbb2b6d9d50b34cf209082f3531a2e0994b5fc02416373666d4d12cee282cec2c3d02c13a640a8
     PATCHES
+        comment-distutils.patch
         CMake-targets.patch
 )