From 274ddacae41b90f711c00d37ebeb15b9f790889c Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 10 Oct 2024 00:16:13 +0800 Subject: [PATCH] [liblzma] update to 5.6.3 (#41427) --- ports/liblzma/portfile.cmake | 3 +-- ports/liblzma/vcpkg.json | 2 +- ports/liblzma/win_output_name.patch | 19 ------------------- versions/baseline.json | 2 +- versions/l-/liblzma.json | 5 +++++ 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 ports/liblzma/win_output_name.patch diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 1bd72943ac..fb3f466440 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tukaani-project/xz REF "v${VERSION}" - SHA512 ec708bcddc64285b0c36b89c9e6413994af4c15bb6865a7bc243a048ce86afccd0df88d46d55aa23fb8071d137dcc19cf357117adc92f030919540f8993cacf9 + SHA512 0f814f4282c87cb74a8383199c1e55ec1bf49519daaf07f7b376cb644770b75cc9257c809b661405fcfd6cda28c54d799c67eb9e169665c35b1b87529468085e HEAD_REF master PATCHES - win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. build-tools.patch ) diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index 364220e1c1..8ec52b8054 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,6 +1,6 @@ { "name": "liblzma", - "version": "5.6.2", + "version": "5.6.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 deleted file mode 100644 index 91e155ac4e..0000000000 --- a/ports/liblzma/win_output_name.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1273,10 +1273,14 @@ 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. -- PREFIX "" -- IMPORT_PREFIX "" -+ OUTPUT_NAME lzma - ) - -+if(WIN32 AND NOT MINGW) -+ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) -+endif() -+ -+ - # Create liblzma-config-version.cmake. - # - # FIXME: SameMajorVersion is correct for stable releases but it is wrong diff --git a/versions/baseline.json b/versions/baseline.json index c13d5afa77..be30757566 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4725,7 +4725,7 @@ "port-version": 1 }, "liblzma": { - "baseline": "5.6.2", + "baseline": "5.6.3", "port-version": 0 }, "libmad": { diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 0cdcc63197..fc2db7b5fa 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5e5694620b41a4d668390e5d14fa2326e0afdc3", + "version": "5.6.3", + "port-version": 0 + }, { "git-tree": "5d13d80adafad99c23899a3f7b60b32c2dae1e43", "version": "5.6.2",