From b095ea5584aa0ece09412cad3491c54610681e4a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 6 Jul 2022 02:06:41 +0800 Subject: [PATCH] [draco] update to v1.5.2 (#25568) * [draco] update to v1.5.2 * update version * add license * overwrite version * add commit * overwrite version --- ports/draco/fix-compile-error-uwp.patch | 32 ++++++++++++------------- ports/draco/portfile.cmake | 4 ++-- ports/draco/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/d-/draco.json | 5 ++++ 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index 63f672d816..0b62512bcd 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,5 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0362420..2b09073 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,10 @@ draco_set_cxx_flags() + draco_set_exe_linker_flags() + draco_generate_features_h() + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + # Draco source file listing variables. + list(APPEND draco_attributes_sources + "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc -index 6e42a58..3c302b9 100644 +index 378de73..be7e032 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc @@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { @@ -13,18 +28,3 @@ index 6e42a58..3c302b9 100644 return true; } -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e79da7..c4d9880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,10 @@ draco_set_build_definitions() - draco_set_cxx_flags() - draco_generate_features_h() - -+if (MSVC) -+ add_compile_options(/wd4996) -+endif() -+ - # Draco source file listing variables. - list(APPEND draco_attributes_sources - "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index bde70c6645..1ae5d45e47 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.4.3 - SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 + REF bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2 + SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0 HEAD_REF master PATCHES fix-compile-error-uwp.patch diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 288be5537a..a2f5617e30 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,8 +1,9 @@ { "name": "draco", - "version": "1.4.3", + "version": "1.5.2", "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.", "homepage": "https://github.com/google/draco", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 37bf327d0b..1b06f4d7d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1961,7 +1961,7 @@ "port-version": 0 }, "draco": { - "baseline": "1.4.3", + "baseline": "1.5.2", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index e3b1eb6d0d..3c06f24600 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", "version": "1.4.3",