[libyaml/sqlpp11/xeus/uvatlas/xxhash] Update to the latest version (#…

…13657) * [many ports] Update to the latest version * [xeus] Fix static build * [usd] Revert change * [xeus] Fix build error * [sqlpp11] Update latest version * [libyaml] Fix build error on Linux * [sqlpp11] Fix build error
microsoft · Sep 28, 2020 · bfc0f48 · bfc0f48
1 parent ae82a55
commit bfc0f48
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 101 deletions.
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL
@@ -1,3 +1,4 @@
 Source: libyaml
-Version: 0.2.2-3
+Version: 0.2.5
+Homepage: https://github.com/yaml/libyaml
 Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yaml/libyaml
-    REF 0.2.2
-    SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
+    REF 2c891fc7a770e8ba2fec34fc6b545c672beb37e6 # 0.2.5
+    SHA512 7cdde7b48c937777b851747f7e0b9a74cb7da30173e09305dad931ef83c3fcee3e125e721166690fe6a0987ba897564500530e5518e4b66b1c9b1db8900bf320
     HEAD_REF master
     PATCHES ${PATCHES}
 )
@@ -25,5 +25,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/yaml TARGET_PATH share/yaml)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/debug/share)
 
-
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file(${SOURCE_PATH}/License ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL
@@ -1,5 +1,5 @@
 Source: sqlpp11
-Version: 0.59
+Version: 0.60
 Homepage: https://github.com/rbock/sqlpp11
 Description: A type safe embedded domain specific language for SQL queries and results in C++.
 Build-Depends: date
diff --git a/ports/sqlpp11/fix-dependency.patch b/ports/sqlpp11/fix-dependency.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8de9fa..82dd632 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+
+ include(CTest)
+
+-
+-### Dependencies 
+-add_subdirectory(dependencies)
+-
+ ### Main targets
+ add_library(sqlpp11 INTERFACE)
+ add_library(sqlpp11::sqlpp11 ALIAS sqlpp11)
+
++find_package(date CONFIG REQUIRED)
+ target_link_libraries(sqlpp11 INTERFACE date::date)
+
+ target_include_directories(sqlpp11 INTERFACE
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake
@@ -1,18 +1,20 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rbock/sqlpp11
-    REF 0.59
-    SHA512 9da05e7a5163200040205b9740d6bf4ad1faa94b2bf031c16d896865b3f10e0fe95a0532a2c2e89adc051250a7f76c550a239916fdd700828d4fb1da566a4fe3
+    REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60
+    SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe
     HEAD_REF master
-    PATCHES ddl2cpp_path.patch
+    PATCHES
+        ddl2cpp_path.patch
+        fix-dependency.patch
 )
 
 # Use sqlpp11's own build process, skipping tests
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-    -DENABLE_TESTS:BOOL=OFF
+        -DENABLE_TESTS:BOOL=OFF
 )
 
 vcpkg_install_cmake()
@@ -21,7 +23,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT})
 
 # Delete redundant and unnecessary directories
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date)
 
 # Move python script from bin directory
 file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts)

diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL
@@ -1,5 +1,5 @@
 Source: uvatlas
-Version: dec2019
+Version: aug2020
 Homepage: https://github.com/Microsoft/UVAtlas
 Description: UVAtlas isochart texture atlas
 Supports: windows
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
@@ -1,36 +1,48 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message(FATAL_ERROR "UVAtlas only supports Windows Desktop")
-endif()
+vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF 1a0a756e5ee4bc764ee89b1e30e6b73b24d2eb55 #dec2019
-    SHA512 810f320d51c11b79f211711d066873d4d082d88e0fdb662a15e105a05028b6e536f159730269865965b7eb33d8cdccb4622c5d945ab67df3e005569cb6df6e59
+    REF 60e2f2d5175f3a9fa6987516c4b44a4f0de3e1fa # aug2020
+    SHA512 6ff99148d8d26345d3e935840d43536558a8174346492d794a4583f50b89a0648bfba3c5a9a433d803fcfd6092716b2f482ff5d1bad896fc4933971dc8107d6d
     HEAD_REF master
 )
 
-IF(TRIPLET_SYSTEM_ARCH MATCHES "x86")
+if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+    set(SOLUTION_TYPE 2019)
+    set(OCILIB_ARCH_X86 x86)
+    set(OCILIB_ARCH_X64 x64)
+else()
+    set(SOLUTION_TYPE 2017)
+    set(OCILIB_ARCH_X86 x86)
+    set(OCILIB_ARCH_X64 x64)
+endif()
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(PLATFORM ${OCILIB_ARCH_X86})
 	SET(BUILD_ARCH "Win32")
-ELSE()
-	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
-ENDIF()
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(PLATFORM ${OCILIB_ARCH_X64})
+	SET(BUILD_ARCH ${OCILIB_ARCH_X64})
+else()
+    set(PLATFORM ${TRIPLET_SYSTEM_ARCH})
+endif()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/UVAtlas/UVAtlas_2015.sln
-	PLATFORM ${BUILD_ARCH}
+    PROJECT_PATH ${SOURCE_PATH}/UVAtlas_Windows10_${SOLUTION_TYPE}.sln
+	PLATFORM ${PLATFORM}
 )
 
 file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Inc/
+	${SOURCE_PATH}/UVAtlas/inc/
     DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Release/UVAtlas.lib
+	${SOURCE_PATH}/UVAtlas/Bin/Windows10_${SOLUTION_TYPE}/${BUILD_ARCH}/Release/UVAtlas.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 file(INSTALL
-	${SOURCE_PATH}/UVAtlas/Bin/Desktop_2015/${BUILD_ARCH}/Debug/UVAtlas.lib
+	${SOURCE_PATH}/UVAtlas/Bin/Windows10_${SOLUTION_TYPE}/${BUILD_ARCH}/Debug/UVAtlas.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 
 vcpkg_download_distfile(uvatlastool

diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL
@@ -1,4 +1,5 @@
 Source: xeus
-Version: 0.20.0-1
+Version: 0.24.1
+Homepage: https://github.com/jupyter-xeus/xeus
 Description: C++ implementation of the Jupyter kernel protocol
 Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/Fix-Compile-nlohmann-json.patch b/ports/xeus/Fix-Compile-nlohmann-json.patch
@@ -1,12 +1,12 @@
 diff --git a/src/xmessage.cpp b/src/xmessage.cpp
-index 0d6ad99..621d838 100644
+index 1ab9544..5a14ba0 100644
 --- a/src/xmessage.cpp
 +++ b/src/xmessage.cpp
-@@ -12,6 +12,7 @@
+@@ -13,6 +13,7 @@
  #include <sstream>
  #include <string>
  #include <utility>
 +#include <ciso646>
 
- #include "xeus/xguid.hpp"
- #include "xeus/xmessage.hpp"
+ #include "nlohmann/json.hpp"
+
diff --git a/ports/xeus/Fix-TypeConversion.patch b/ports/xeus/Fix-TypeConversion.patch
diff --git a/ports/xeus/Fix-static-build.patch b/ports/xeus/Fix-static-build.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d02b5d6..6484131 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,10 @@ macro(xeus_create_target target_name linkage output_name)
+         PUBLIC xtl
+     )
+
+-    target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
++	if (MSVC)
++	    target_link_libraries(OpenSSL::Crypto INTERFACE crypt32)
++    endif ()
++	target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
+
+     if (NOT MSVC)
+         if (APPLE)
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO QuantStack/xeus
-    REF 8408f237f33514610a59d19a5ff045ee70dfa02b
-    SHA512 41282addbe5519b6d357e802c48483834cd951604bfeb8c99d96f02d03dec2fc66ea4c091f40ec09348bb60587e8a6efef5e6eb2bb950ba720fc8ceb7a107960
+    REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
+    SHA512 877ca45bf649b567a9921d3e8f0adb0299dbe956978bd6e217d0c06617cf3466d08d90d607fd33e129089472e1a96ecec78b1fc21346bc13ba268168a5a6b068
     HEAD_REF master
     PATCHES
-		Fix-TypeConversion.patch
-		Fix-Compile-nlohmann-json.patch
+		Fix-Compile-nlohmann-json.patch
+		Fix-static-build.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
@@ -43,6 +43,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         "#ifdef XEUS_STATIC_LIB"
         "#if 1 // #ifdef XEUS_STATIC_LIB"
     )
+	file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 # Handle copyright

diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL
@@ -1,4 +1,4 @@
 Source: xxhash
-Version: 0.7.0
+Version: 0.8.0
 Homepage: https://github.com/Cyan4973/xxHash
 Description: Extremely fast hash algorithm
diff --git a/ports/xxhash/fix-arm-uwp.patch b/ports/xxhash/fix-arm-uwp.patch
diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake
@@ -1,14 +1,11 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cyan4973/xxHash
-    REF a728fc9fe895460ff0e5f1efc2ce233d2095fd20
-    SHA512 7795be00054d5f7abf4afab5912cc532bfc47f0bc8278cf09a44feb854f11e921d3d43e734efda1edbae0722450e4f9f02eeb5954220293eac930b4fa13ff737
+    REF 94e5f23e736f2bb67ebdf90727353e65344f9fc0 # v0.8.0
+    SHA512 367c82b37fd188890574446a7c237294a4a9ba038aff9a19a5d5d119058df74c089c682e9abad3281d5e14020c08834666343b2ea18378f400c8a0ee640098b8
     HEAD_REF dev
-    PATCHES fix-arm-uwp.patch
 )
 
 vcpkg_configure_cmake(
@@ -18,10 +15,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xxHash TARGET_PATH share/${PORT})
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xxhash)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/xxhash/LICENSE ${CURRENT_PACKAGES_DIR}/share/xxhash/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)