From b1ba80fb3a325bafa3c136a37c2f7922b7ca6748 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 9 Oct 2024 03:51:18 +0800 Subject: [PATCH] [alembic] update to 1.8.7 (#41411) --- ports/alembic/fix-runtime-destination.patch | 30 --------------------- ports/alembic/portfile.cmake | 4 +-- ports/alembic/vcpkg.json | 2 +- versions/a-/alembic.json | 5 ++++ versions/baseline.json | 2 +- 5 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 ports/alembic/fix-runtime-destination.patch diff --git a/ports/alembic/fix-runtime-destination.patch b/ports/alembic/fix-runtime-destination.patch deleted file mode 100644 index 093218644d..0000000000 --- a/ports/alembic/fix-runtime-destination.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 860a8be..ee0f4f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,7 @@ option(DOCS_PATH - - # Set static/dynamic build options - SET(LIB_TYPE STATIC) --SET(RUNTIME_INSTALL_DIR lib) -+SET(RUNTIME_INSTALL_DIR bin) - SET(LIBRARY_INSTALL_DIR lib) - SET(ARCHIVE_INSTALL_DIR lib) - IF (ALEMBIC_SHARED_LIBS) -diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt -index 25e760c..9acac61 100644 ---- a/lib/Alembic/CMakeLists.txt -+++ b/lib/Alembic/CMakeLists.txt -@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic - SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs") - INSTALL(TARGETS Alembic - EXPORT AlembicTargets -- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}) -+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} -+ ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR} -+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}) - - #-****************************************************************************** - # PACKAGE EXPORTS diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 47f5a103a8..2aff154b28 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic REF "${VERSION}" - SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b + SHA512 510cc85346b685833091cd616ad6d8a3ba602e716747ab8dea6573abbaa1a2d49eed80b2d566b68293df78f3f3b9cf412ff4e3515f0d37951d63b9634b207a08 HEAD_REF master - PATCHES - fix-runtime-destination.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS) diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index a472781f61..bb6bc853a2 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "alembic", - "version": "1.8.6", + "version": "1.8.7", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index 3f84f4eb24..c0420a2fe1 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f65e2f9fbe3059405f79ec9ea833a52ccf098328", + "version": "1.8.7", + "port-version": 0 + }, { "git-tree": "ca5f035424c794b8cde9d41c7103b612e912a275", "version": "1.8.6", diff --git a/versions/baseline.json b/versions/baseline.json index 6d98721129..5f602957ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -73,7 +73,7 @@ "port-version": 7 }, "alembic": { - "baseline": "1.8.6", + "baseline": "1.8.7", "port-version": 0 }, "aliyun-oss-c-sdk": {