diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 17:59:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:59:45 -0700 |
| commit | 460b6d5f20c46385f323a5ccc436e8d85059e1b4 (patch) | |
| tree | 2dfe37d7f319ef75e0a420a579bc35509a3c7b54 /ports/draco | |
| parent | a8c046b4833e6d89325f795c1ae189e4e2e26733 (diff) | |
| download | vcpkg-460b6d5f20c46385f323a5ccc436e8d85059e1b4.tar.gz vcpkg-460b6d5f20c46385f323a5ccc436e8d85059e1b4.zip | |
[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>
Diffstat (limited to 'ports/draco')
| -rw-r--r-- | ports/draco/CONTROL | 3 | ||||
| -rw-r--r-- | ports/draco/fix-compile-error-uwp.patch | 23 | ||||
| -rw-r--r-- | ports/draco/fix-uwperror.patch | 4 | ||||
| -rw-r--r-- | ports/draco/portfile.cmake | 9 |
4 files changed, 25 insertions, 14 deletions
diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL index ace5fc650..4bfe82e85 100644 --- 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:
diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index df0b1df22..b098fd715 100644 --- 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) diff --git a/ports/draco/fix-uwperror.patch b/ports/draco/fix-uwperror.patch index ff643103e..54e2cc9ab 100644 --- 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) diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 22d332f98..ae72d0041 100644 --- 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) |
