From a487471068f4cb1cbb4eeb340763cdcc0a75fd68 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 13 Jun 2023 23:03:20 -0700 Subject: [PATCH] [liblzma] Update to 5.4.3 (#31603) * [liblzma] Update to 5.4.3 * update version --------- Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/liblzma/portfile.cmake | 14 +++++++------- ports/liblzma/vcpkg.json | 3 +-- ports/liblzma/win_output_name.patch | 8 ++++---- versions/baseline.json | 4 ++-- versions/l-/liblzma.json | 5 +++++ 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 8631df28b0..7c8f5aa09c 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -1,9 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO lzmautils - FILENAME "xz-${VERSION}.tar.xz" - SHA512 f890ee5207799fbc7bb9ae031f444d39d82275b0e1b8cc7f01fdb9270050e38849bd1269db2a2f12fe87b5e23e03f9e809a5c3456d066c0a56e6f98d728553ea + REPO tukaani-project/xz + REF "v${VERSION}" + SHA512 67292be900a713035d2a3dab4c3b6697cf0db37a78faaa5e0d3f5a96909ef9645c15a6030af94fb7f4224c3ad8eacd1a653ba67dfdeb6372165c1c36e0cf16b7 + HEAD_REF master PATCHES fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. @@ -39,7 +39,7 @@ set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(includedir "\${prefix}/include") set(PACKAGE_URL https://tukaani.org/xz/) -set(PACKAGE_VERSION 5.2.5) +set(PACKAGE_VERSION 5.4.3) if(NOT VCPKG_TARGET_IS_WINDOWS) set(PTHREAD_CFLAGS -pthread) endif() @@ -81,4 +81,4 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index d0ac62bed4..f20ff04989 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblzma", - "version-semver": "5.4.1", - "port-version": 1, + "version": "5.4.3", "description": "Compression library with an API similar to that of zlib.", "homepage": "https://tukaani.org/xz/", "license": null, diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch index 7011475de5..9a845bdbae 100644 --- a/ports/liblzma/win_output_name.patch +++ b/ports/liblzma/win_output_name.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e80b524..cddbccb 100644 +index 0c6d4b7..62a824a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -462,8 +462,11 @@ set_target_properties(liblzma PROPERTIES +@@ -868,8 +868,11 @@ set_target_properties(liblzma PROPERTIES # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. # Avoid the name lzma.dll because it would conflict with LZMA SDK. @@ -13,5 +13,5 @@ index e80b524..cddbccb 100644 + set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) +endif() - # Create liblzma-config-version.cmake. We use this spelling instead of - # liblzmaConfig.cmake to make find_package work in case insensitive manner + # Create liblzma-config-version.cmake. + # diff --git a/versions/baseline.json b/versions/baseline.json index cdce86dea5..0ee4f90c7f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4237,8 +4237,8 @@ "port-version": 2 }, "liblzma": { - "baseline": "5.4.1", - "port-version": 1 + "baseline": "5.4.3", + "port-version": 0 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 9805c267d1..f596c82a06 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba357d6805e44b3df1ed4343801f1b61a5d63de0", + "version": "5.4.3", + "port-version": 0 + }, { "git-tree": "9a3ebbf75e1c3adb76d7e71717c1f03bb291036a", "version-semver": "5.4.1",