From 591c558fdaf706dea248ab744f3043834c1fd7ad Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:57:01 +0100 Subject: [PATCH] [draco] Update to 1.4.3 (#21121) * Update draco to 1.4.3 * Update CI baseline * Disable symlinks * Update git-tree hash Co-authored-by: chausner --- ports/draco/disable-symlinks.patch | 31 +++++++++++++++++++++++++ ports/draco/portfile.cmake | 36 +++++++++++++++--------------- ports/draco/vcpkg.json | 14 ++++++++++-- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 5 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 ports/draco/disable-symlinks.patch diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch new file mode 100644 index 0000000000..62221b9830 --- /dev/null +++ b/ports/draco/disable-symlinks.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake +index f2acc72..fb8ce4a 100644 +--- a/cmake/draco_targets.cmake ++++ b/cmake/draco_targets.cmake +@@ -102,10 +102,6 @@ macro(draco_add_executable) + + add_executable(${exe_NAME} ${exe_SOURCES}) + +- 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) + set_target_properties(${lib_NAME} PROPERTIES PREFIX "") + endif() + +- if(NOT EMSCRIPTEN) +- # VERSION and SOVERSION as necessary +- if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) +- set_target_properties(${lib_NAME} +- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION +- ${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 201f73cca6..bde70c6645 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,36 +3,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.4.1 - SHA512 55B8AF74552987220FB23580F6B167E4610A1341BC36117B6D235C05E126A79981F93787ACB90210127DC779B3134A1D9CC8D6697B1286459F233BF660B890BC + REF 1.4.3 + SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 HEAD_REF master PATCHES fix-compile-error-uwp.patch fix-uwperror.patch + disable-symlinks.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake) vcpkg_fixup_pkgconfig() -# Install tools and plugins -file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") -if(TOOLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/draco) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/draco) -endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +# Install tools and plugins +vcpkg_copy_tools( + TOOL_NAMES + draco_encoder + draco_decoder + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() # 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) diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 171493214e..288be5537a 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,16 @@ { "name": "draco", - "version": "1.4.1", + "version": "1.4.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" + "homepage": "https://github.com/google/draco", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2f17dfaf74..21ade75931 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,7 +1889,7 @@ "port-version": 1 }, "draco": { - "baseline": "1.4.1", + "baseline": "1.4.3", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 2ac33f2df0..e3b1eb6d0d 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "3289b6aa2981d3fb169f35ca384608b514210401", "version": "1.4.1",