From 52cadeeb5f967af68cc343dfd32261df75f18b65 Mon Sep 17 00:00:00 2001 From: NOT XVilka Date: Sat, 5 Apr 2025 12:30:58 +0800 Subject: [PATCH] subprojects: update xz to 5.8.1 (#5067) Co-authored-by: Anton Kochkov --- subprojects/liblzma.wrap | 15 +++++++-------- .../{xz-5.6.4 => xz-5.8.1}/config.h.meson | 0 .../{xz-5.6.4 => xz-5.8.1}/meson.build | 2 +- .../{xz-5.6.4 => xz-5.8.1}/meson_options.txt | 0 .../src/liblzma/meson.build | 2 -- .../{xz-5.6.4 => xz-5.8.1}/src/meson.build | 0 6 files changed, 8 insertions(+), 11 deletions(-) rename subprojects/packagefiles/{xz-5.6.4 => xz-5.8.1}/config.h.meson (100%) rename subprojects/packagefiles/{xz-5.6.4 => xz-5.8.1}/meson.build (99%) rename subprojects/packagefiles/{xz-5.6.4 => xz-5.8.1}/meson_options.txt (100%) rename subprojects/packagefiles/{xz-5.6.4 => xz-5.8.1}/src/liblzma/meson.build (98%) rename subprojects/packagefiles/{xz-5.6.4 => xz-5.8.1}/src/meson.build (100%) diff --git a/subprojects/liblzma.wrap b/subprojects/liblzma.wrap index ada13e8361..c890f1bd41 100644 --- a/subprojects/liblzma.wrap +++ b/subprojects/liblzma.wrap @@ -1,12 +1,11 @@ [wrap-file] -directory = xz-5.6.4 -source_url = https://raw.githubusercontent.com/rizinorg/fallback-repo/main/xz-5.6.4.tar.gz -source_fallback_url = https://github.com/tukaani-project/xz/releases/download/v5.6.4/xz-5.6.4.tar.gz -# source_fallback_url = https://tukaani.org/xz/xz-5.6.4.tar.gz // possibly has different hash, let's prefer github -source_filename = xz-5.6.4.tar.gz -source_hash = 269e3f2e512cbd3314849982014dc199a7b2148cf5c91cedc6db629acdf5e09b -patch_directory = xz-5.6.4 +directory = xz-5.8.1 +source_url = https://raw.githubusercontent.com/rizinorg/fallback-repo/main/xz-5.8.1.tar.gz +source_fallback_url = https://github.com/tukaani-project/xz/releases/download/v5.8.1/xz-5.8.1.tar.gz +# source_fallback_url = https://tukaani.org/xz/xz-5.8.1.tar.gz // possibly has different hash, let's prefer github +source_filename = xz-5.8.1.tar.gz +source_hash = 507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543 +patch_directory = xz-5.8.1 [provide] liblzma = lzma_dep - diff --git a/subprojects/packagefiles/xz-5.6.4/config.h.meson b/subprojects/packagefiles/xz-5.8.1/config.h.meson similarity index 100% rename from subprojects/packagefiles/xz-5.6.4/config.h.meson rename to subprojects/packagefiles/xz-5.8.1/config.h.meson diff --git a/subprojects/packagefiles/xz-5.6.4/meson.build b/subprojects/packagefiles/xz-5.8.1/meson.build similarity index 99% rename from subprojects/packagefiles/xz-5.6.4/meson.build rename to subprojects/packagefiles/xz-5.8.1/meson.build index ff8afd1f21..c9a3b70343 100644 --- a/subprojects/packagefiles/xz-5.6.4/meson.build +++ b/subprojects/packagefiles/xz-5.8.1/meson.build @@ -1,6 +1,6 @@ # liblzma is what upstream uses for their pkg-config name project('liblzma', 'c', - version : '5.6.4', + version : '5.8.1', license : ['PD', 'LGPL2', 'GPL2', 'GPL3'], meson_version: '>=0.55.0', ) diff --git a/subprojects/packagefiles/xz-5.6.4/meson_options.txt b/subprojects/packagefiles/xz-5.8.1/meson_options.txt similarity index 100% rename from subprojects/packagefiles/xz-5.6.4/meson_options.txt rename to subprojects/packagefiles/xz-5.8.1/meson_options.txt diff --git a/subprojects/packagefiles/xz-5.6.4/src/liblzma/meson.build b/subprojects/packagefiles/xz-5.8.1/src/liblzma/meson.build similarity index 98% rename from subprojects/packagefiles/xz-5.6.4/src/liblzma/meson.build rename to subprojects/packagefiles/xz-5.8.1/src/liblzma/meson.build index 213a33ad70..6c83b6b384 100644 --- a/subprojects/packagefiles/xz-5.6.4/src/liblzma/meson.build +++ b/subprojects/packagefiles/xz-5.8.1/src/liblzma/meson.build @@ -53,9 +53,7 @@ main_dec_sources = [ ] check_sources = ['check/check.c', - 'check/crc32_table.c', 'check/crc32_fast.c', - 'check/crc64_table.c', 'check/crc64_fast.c', 'check/sha256.c' ] diff --git a/subprojects/packagefiles/xz-5.6.4/src/meson.build b/subprojects/packagefiles/xz-5.8.1/src/meson.build similarity index 100% rename from subprojects/packagefiles/xz-5.6.4/src/meson.build rename to subprojects/packagefiles/xz-5.8.1/src/meson.build