diff options
| author | wangli28 <47812810+wangli28@users.noreply.github.com> | 2019-06-07 02:03:08 +0000 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-06 19:03:08 -0700 |
| commit | 5ef8bb9abc0f6a9551ac48006fc04b9d91cc5716 (patch) | |
| tree | 7c9ddc14de53296dad369cb56c3bfa4063a09b8c /ports/draco | |
| parent | b9cf3384c38585273319ca2111629e955f8c4097 (diff) | |
| download | vcpkg-5ef8bb9abc0f6a9551ac48006fc04b9d91cc5716.tar.gz vcpkg-5ef8bb9abc0f6a9551ac48006fc04b9d91cc5716.zip | |
[draco, flatbuffers, forge] Update to new version (#6796)
Diffstat (limited to 'ports/draco')
| -rw-r--r-- | ports/draco/CONTROL | 2 | ||||
| -rw-r--r-- | ports/draco/fix-compile-error-uwp.patch | 45 | ||||
| -rw-r--r-- | ports/draco/fix-uwperror.patch | 13 | ||||
| -rw-r--r-- | ports/draco/portfile.cmake | 5 |
4 files changed, 32 insertions, 33 deletions
diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL index afdeb1e6d..555c66d0a 100644 --- a/ports/draco/CONTROL +++ b/ports/draco/CONTROL @@ -1,4 +1,4 @@ Source: draco
-Version: 1.3.3-2
+Version: 1.3.5
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 874ea7432..df0b1df22 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,30 +1,15 @@ -diff --git a/src/draco/core/symbol_coding_utils.h b/src/draco/core/symbol_coding_utils.h
-index be2183d..eaaca00 100644
---- a/src/draco/core/symbol_coding_utils.h
-+++ b/src/draco/core/symbol_coding_utils.h
-@@ -41,7 +41,9 @@ typename std::make_unsigned<IntTypeT>::type ConvertSignedIntToSymbol(
- if (val >= 0) {
- return static_cast<UnsignedType>(val) << 1;
- }
-- val = -(val + 1); // Map -1 to 0, -2 to -1, etc..
-+ // Map -1 to 0, -2 to -1, etc..
-+ val += 1;
-+ val *= -1;
- UnsignedType ret = static_cast<UnsignedType>(val);
- ret <<= 1;
- ret |= 1;
-diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 1aa52cc..cfbbdbd 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))
- return false;
-- *value = (sign < 0) ? -v : v;
-+ if (sign < 0)
-+ v *= -1;
-+ *value = v;
- return true;
- }
-
+diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc +index 0a22ba1..9862949 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)) + return false; +- *value = (sign < 0) ? -v : v; ++ if (sign < 0) ++ v *= -1; ++ *value = v; + return true; + } + diff --git a/ports/draco/fix-uwperror.patch b/ports/draco/fix-uwperror.patch new file mode 100644 index 000000000..ff643103e --- /dev/null +++ b/ports/draco/fix-uwperror.patch @@ -0,0 +1,13 @@ +diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h +index f63cd07..0f6baaf 100644 +--- a/src/draco/core/bit_utils.h ++++ b/src/draco/core/bit_utils.h +@@ -26,6 +26,8 @@ + #include <intrin.h> + #endif // defined(_MSC_VER) + ++#pragma warning(disable:4146) ++ + namespace draco { + + // Returns the number of '1' bits within the input 32 bit integer. diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 3486134fb..22d332f98 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -5,11 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.3.3 - SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897 + REF 1.3.5 + SHA512 f99fcbec60fbd1683d8aacc35ff8ad9ee1c84374132ad4cc8c0f56662f5d33f940f89028cf3e577cde3314fd0766c124f61798121e4127e888f302e9efe1a004 HEAD_REF master PATCHES fix-compile-error-uwp.patch + fix-uwperror.patch ) vcpkg_configure_cmake( |