From a345bbdc68cdfda65603e24413b21afb28f110fb Mon Sep 17 00:00:00 2001 From: SunBlack Date: Wed, 4 Dec 2024 21:54:24 +0100 Subject: [PATCH] [libe57format] Update to 3.2.0 (#42498) --- ports/libe57format/portfile.cmake | 7 +++---- ports/libe57format/usage | 2 +- ports/libe57format/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libe57format.json | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libe57format/portfile.cmake b/ports/libe57format/portfile.cmake index 8f22d2ba5a..2a5a75d84a 100644 --- a/ports/libe57format/portfile.cmake +++ b/ports/libe57format/portfile.cmake @@ -2,19 +2,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmaloney/libE57Format REF "v${VERSION}" - SHA512 9be79a969b74008801e20531530cdf3dc1f0041d6fbd2be1aaa8d58b35b06309b1f324309ad1d989a345389ed168c96c325ebe65844efec9bbffd183bf2e4766 + SHA512 3c69766fbd4b048db760835181fdb928add08b5914c00f3927739a36797aa4417b0607654100c578e1c8778605b617bc2a29d342d26931bdb87924ca58080dcd HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" E57_BUILD_SHARED) -string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" E57_USING_STATIC_XERCES) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DE57_BUILD_TEST=OFF -DE57_BUILD_SHARED=${E57_BUILD_SHARED} - -DUSING_STATIC_XERCES=${E57_USING_STATIC_XERCES} + -DE57_RELEASE_LTO=OFF ) vcpkg_cmake_install() @@ -26,4 +25,4 @@ file(REMOVE_RECURSE ) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libe57format RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/libe57format/usage b/ports/libe57format/usage index eb3f459983..97bf3fe40f 100644 --- a/ports/libe57format/usage +++ b/ports/libe57format/usage @@ -1,4 +1,4 @@ libe57format provides CMake targets: - find_package(e57format CONFIG REQUIRED) + find_package(E57Format CONFIG REQUIRED) target_link_libraries(main PRIVATE E57Format) diff --git a/ports/libe57format/vcpkg.json b/ports/libe57format/vcpkg.json index 7d00f4ee0f..89615c6c43 100644 --- a/ports/libe57format/vcpkg.json +++ b/ports/libe57format/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libe57format", - "version": "3.1.1", + "version": "3.2.0", "description": "A library to provide read & write support for the E57 file format.", "homepage": "https://github.com/asmaloney/libE57Format", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 459de6c80d..3bf25305a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4489,7 +4489,7 @@ "port-version": 4 }, "libe57format": { - "baseline": "3.1.1", + "baseline": "3.2.0", "port-version": 0 }, "libebur128": { diff --git a/versions/l-/libe57format.json b/versions/l-/libe57format.json index b537e07c7a..89146ee170 100644 --- a/versions/l-/libe57format.json +++ b/versions/l-/libe57format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ff8b875bf54e984d9f85d80194bed578cb1638e", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "fb409510c8365dadc49053428c15e36163d204e2", "version": "3.1.1",