[dimcli/draco/refprop-headers/coolprop] Update version (#13679)

* [manyports] Update version 5 * [coolprop] Update version * Update CONTROL * Update ports/refprop-headers/CONTROL Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2024-11-24 04:43:18 +08:00 · 2020-09-27 17:59:45 -07:00 · 2020-09-27 17:59:45 -07:00 · 460b6d5f20
commit 460b6d5f20
parent a8c046b483
13 changed files with 97 additions and 80 deletions
--- a/ports/coolprop/CONTROL
+++ b/ports/coolprop/CONTROL
@ -1,5 +1,5 @@
 Source: coolprop
-Version: 6.1.0-5
+Version: 6.4.1
 Homepage: https://github.com/CoolProp/CoolProp
 Description: Thermophysical properties for the masses
 Build-Depends: catch, eigen3, pybind11, if97, fmt, rapidjson, msgpack, refprop-headers
--- a/ports/coolprop/fix-builderror.patch
+++ b/ports/coolprop/fix-builderror.patch
@ -1,5 +1,5 @@
 diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp
-index ce86cf6..681db13 100644
+index 4152f01..e5986ca 100644
 --- a/src/ODEIntegrators.cpp
 +++ b/src/ODEIntegrators.cpp
@@ -4,6 +4,8 @@
--- a/ports/coolprop/fix-dependency.patch
+++ b/ports/coolprop/fix-dependency.patch
@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d61aff..80ac50a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -237,10 +237,10 @@ list(REMOVE_ITEM  APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/Tests/CoolProp-Te
+ list(REMOVE_ITEM  APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp")
+ 
+ set (APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
+-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/Eigen")
+-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/msgpack-c/include")
+-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib/include")
+-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib") # should be deprecated
+find_package(Eigen3 CONFIG REQUIRED)
+find_package(msgpack CONFIG REQUIRED)
+find_package(fmt CONFIG REQUIRED)
+link_libraries(Eigen3::Eigen msgpackc msgpackc-cxx fmt::fmt)
+ list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+ list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
+ 
--- a/ports/coolprop/fmt-fix.patch
+++ b/ports/coolprop/fmt-fix.patch
@ -1,39 +1,39 @@
-diff --git a/include/CPstrings.h b/include/CPstrings.h
-index 2e5a5af..87f6b7c 100644
--- a/include/CPstrings.h
-+++ b/include/CPstrings.h
-@@ -5,6 +5,8 @@
-     #include <iterator>
-     #include <algorithm>
-     #include <functional>
-+    #include <vector>
-+    #include <string>
- 
- #if !defined(NO_CPPFORMAT)
-     #ifndef FMT_HEADER_ONLY
-@@ -13,9 +15,6 @@
-     #include "fmt/format.h" // For addition of the string formatting functions and macros from cppformat
-     #include "fmt/printf.h" // For sprintf
-     #undef FMT_HEADER_ONLY
-#else
-    #include <vector>
-    #include <string>
- #endif
- 
-     #include "Exceptions.h"
-@@ -57,11 +56,11 @@
-     // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks
-     inline std::string format(const char* fmt, ...);
- #else
-    // Missing std::string formatting function - provided by the cppformat library
-    inline std::string format(const char *format, fmt::ArgList args) {
-      return fmt::sprintf(format, args);
-+    template<class...Args>
-+    std::string format(const Args & ... args)
-+    {
-+        return fmt::sprintf(args...);
-     }
-    FMT_VARIADIC(std::string, format, const char *)
- #endif
- 
-     // Missing string split - like in Python
+diff --git a/include/CPstrings.h b/include/CPstrings.h
+index b99820a..fe6a2aa 100644
+--- a/include/CPstrings.h
+++ b/include/CPstrings.h
+@@ -6,6 +6,8 @@
+     #include <algorithm>
+     #include <functional>
+     #include <cctype>
+    #include <vector>
+    #include <string>
+ 
+ #if !defined(NO_FMTLIB)
+     #ifndef FMT_HEADER_ONLY
+@@ -14,9 +16,6 @@
+     #include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib
+     #include "fmt/printf.h" // For sprintf
+     #undef FMT_HEADER_ONLY
+-#else
+-    #include <vector>
+-    #include <string>
+ #endif
+ 
+     #include "Exceptions.h"
+@@ -58,11 +57,11 @@
+     // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks
+     inline std::string format(const char* fmt, ...);
+ #else
+-    // Missing std::string formatting function - provided by the fmtlib library
+-    inline std::string format(const char *format, fmt::ArgList args) {
+-      return fmt::sprintf(format, args);
+    template<class...Args>
+    std::string format(const Args & ... args)
+    {
+        return fmt::sprintf(args...);
+     }
+-    FMT_VARIADIC(std::string, format, const char *)
+     // For latest FMTLIB
+     /*template <typename... Args>
+     inline std::string format(const char *format_str, const Args & ... args) {
--- a/ports/coolprop/portfile.cmake
+++ b/ports/coolprop/portfile.cmake
@ -3,12 +3,13 @@ set(PORT_VERSION 6.1.0)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CoolProp/CoolProp
-    REF 0e934e842e9ce83eea64fda1d4ab8e59adf9d8cd
-    SHA512 a44eafc84f2b88259d7bcf6cfa81daeb81ea9d55bd356e59b3ef77b6f68ea405961c7cb54ba899e3896bb2a02d3e01119a4a51f72899126c8da6081fa2ece948
+    REF f5ebb4e655add4c23bb327ab5209f3dbf919bc6d # v6.4.1
+    SHA512 916d00777fe56035171ed0a6cbe09b8d4487317772802e4fe9b43f5965f3212dcb3754e18fe1db9c748a4d17facbbe6cb2244451cf5cf66334465760fc1701b7
    HEAD_REF master
    PATCHES
        fmt-fix.patch
        fix-builderror.patch
+        fix-dependency.patch
 )

 vcpkg_find_acquire_program(PYTHON2)
@ -116,8 +117,4 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/${TARGET_FOLDER} ${CURRENT_PACKAGES_DIR}/${TARGET_FOLDER})

 # Handle copyright
-file(
-  INSTALL ${SOURCE_PATH}/LICENSE
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-  RENAME copyright
-)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/dimcli/CONTROL
+++ b/ports/dimcli/CONTROL
@ -1,4 +1,4 @@
 Source: dimcli
-Version: 5.0.1
+Version: 5.0.2
 Homepage: https://github.com/gknowles/dimcli
 Description: C++ command line parser toolkit
--- a/ports/dimcli/portfile.cmake
+++ b/ports/dimcli/portfile.cmake
@ -1,14 +1,11 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO gknowles/dimcli
-    REF v5.0.1
-    SHA512 ff005777230f9ded5e407f11ebed7d70db2a18ec60da8c80d36644b96c9d090d2f211e3c36b7d296a446c1b54d61c359a51082034b94e2398cc2305316f33d0f
+    REF a4dbb4b1c8a3825fc304bbbad3438dbe1840feae # v5.0.2
+    SHA512 25cc9002fd46856854545934f385d8578f207b1ce01802a172e49e008cdf1db0db11db7cefeef18258b99c13570af9193e83f5826613d8b0a118d7bae3f0d03f
    HEAD_REF master
-	PATCHES
-		fix-NameBoolean.patch
 )
+
 set(staticCrt OFF)
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
    set(staticCrt ON)
@ -28,8 +25,4 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 # Handle copyright
-file(
-    INSTALL "${SOURCE_PATH}/LICENSE"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli"
-    RENAME copyright
-)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli" RENAME copyright)
--- a/ports/draco/CONTROL
+++ b/ports/draco/CONTROL
@ -1,5 +1,4 @@
 Source: draco
-Version: 1.3.5
+Version: 1.3.6
 Homepage: https://github.com/google/draco
 Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
-Build-Depends:
--- a/ports/draco/fix-compile-error-uwp.patch
+++ b/ports/draco/fix-compile-error-uwp.patch
@ -1,11 +1,11 @@
 diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 0a22ba1..9862949 100644
+index 6e42a58..3c302b9 100644
 --- a/src/draco/io/parser_utils.cc
 +++ b/src/draco/io/parser_utils.cc
-@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
-   uint32_t v;
-   if (!ParseUnsignedInt(buffer, &v))
+@@ -160,7 +160,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
+   if (!ParseUnsignedInt(buffer, &v)) {
     return false;
+   }
 -  *value = (sign < 0) ? -v : v;
 +  if (sign < 0)
 +    v *= -1;
@ -13,3 +13,18 @@ index 0a22ba1..9862949 100644
   return true;
 }
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e79da7..c4d9880 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -153,6 +153,10 @@ if(ENABLE_EXTRA_SPEED)
+   endif()
+ endif()
+ 
+if (MSVC)
+  add_compile_options(/wd4996)
+endif()
+
+ # Generate a version file containing repository info.
+ include(FindGit)
+ find_package(Git)
--- a/ports/draco/fix-uwperror.patch
+++ b/ports/draco/fix-uwperror.patch
@ -1,8 +1,8 @@
 diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h
-index f63cd07..0f6baaf 100644
+index a102095..b6ba69b 100644
 --- a/src/draco/core/bit_utils.h
 +++ b/src/draco/core/bit_utils.h
-@@ -26,6 +26,8 @@
+@@ -27,6 +27,8 @@
 #include <intrin.h>
 #endif  // defined(_MSC_VER)
 
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@ -1,12 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/draco
-    REF 1.3.5
-    SHA512 f99fcbec60fbd1683d8aacc35ff8ad9ee1c84374132ad4cc8c0f56662f5d33f940f89028cf3e577cde3314fd0766c124f61798121e4127e888f302e9efe1a004
+    REF 83b0922745981a35be16e2907bdbb749ebf2bf43 # 1.3.6
+    SHA512 29b270d749c5c0efcf791aaae7e33e2ae4404103ad8849d73aaca71492a3780d2fcaec01ec225da886bce2ab20ec14b8cf2d9e0976810cdaee557f97b3b0d9b8
    HEAD_REF master
    PATCHES
        fix-compile-error-uwp.patch
@ -40,5 +38,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 vcpkg_copy_pdbs()

 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/draco)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/draco/LICENSE ${CURRENT_PACKAGES_DIR}/share/draco/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/refprop-headers/CONTROL
+++ b/ports/refprop-headers/CONTROL
@ -1,4 +1,4 @@
 Source: refprop-headers
-Version: 2017-11-7-882aec454b2bc3d5323b8691736ff09c288f4ed6
+Version: 2019-04-14
 Homepage: https://github.com/CoolProp/REFPROP-headers
 Description: The REFPROP Headers
--- a/ports/refprop-headers/portfile.cmake
+++ b/ports/refprop-headers/portfile.cmake
@ -1,11 +1,8 @@
-include(vcpkg_common_functions)
-set(PORT_COMMIT 882aec454b2bc3d5323b8691736ff09c288f4ed6)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CoolProp/REFPROP-headers
-    REF ${PORT_COMMIT}
-    SHA512 23ee3df4ffe21b2d790efa27a1b8ea5fa4fce0a274d78e493a2d71043670420e19216f925d23d04f6139ca084a21b97028bd2547f3dbd00ffbb33d0c0bbfece5
+    REF 8df35c7cb557d385bb66431e92e836104a63a33c
+    SHA512 4424d036c3cd6c9028fffbeda0919d38f4b0a290fb141c6d1ff26c70cd416d9a0d2e1584c51b6ad2e989e84a8a71660f62dadaa88bb22428972165ba01131cb2
    HEAD_REF master
 )