From cb423b30a07fb7d992cd68d2337fbf3a63ec4cd6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sun, 9 Oct 2022 22:59:27 +0200 Subject: [PATCH] draco: Update to 1.5.3 (#27145) --- ports/draco/disable-symlinks.patch | 14 ++++++-------- ports/draco/portfile.cmake | 12 +++++------- ports/draco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch index 62221b9830..feca85f15a 100644 --- a/ports/draco/disable-symlinks.patch +++ b/ports/draco/disable-symlinks.patch @@ -1,19 +1,18 @@ diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake -index f2acc72..fb8ce4a 100644 +index f96dbb1..179b9f9 100644 --- a/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake -@@ -102,10 +102,6 @@ macro(draco_add_executable) - +@@ -103,9 +103,6 @@ macro(draco_add_executable) add_executable(${exe_NAME} ${exe_SOURCES}) + target_compile_features(${exe_NAME} PRIVATE cxx_std_11) - if(NOT EMSCRIPTEN) - set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) - endif() -- + if(exe_OUTPUT_NAME) set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) - endif() -@@ -337,15 +333,6 @@ macro(draco_add_library) +@@ -340,14 +337,6 @@ macro(draco_add_library) set_target_properties(${lib_NAME} PROPERTIES PREFIX "") endif() @@ -25,7 +24,6 @@ index f2acc72..fb8ce4a 100644 - ${DRACO_SOVERSION_MAJOR}) - endif() - endif() -- + if(BUILD_SHARED_LIBS AND (MSVC OR WIN32)) if(lib_TYPE STREQUAL SHARED) - target_compile_definitions(${lib_NAME} PRIVATE "DRACO_BUILDING_DLL=1") diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 1ae5d45e47..d34619dde7 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 bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2 - SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0 + REF 1.5.3 + SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d HEAD_REF master PATCHES fix-compile-error-uwp.patch @@ -18,7 +18,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) vcpkg_fixup_pkgconfig() # Install tools and plugins @@ -29,10 +29,8 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index a2f5617e30..3fedb46f23 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "draco", - "version": "1.5.2", + "version": "1.5.3", "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", diff --git a/versions/baseline.json b/versions/baseline.json index d5ed974e52..c7b30d318a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,7 +2009,7 @@ "port-version": 0 }, "draco": { - "baseline": "1.5.2", + "baseline": "1.5.3", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 3c06f24600..dace9381ae 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354", + "version": "1.5.3", + "port-version": 0 + }, { "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1", "version": "1.5.2",