From 7205f011a3c39f2b783e7b1df3355bcdc92d7aef Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sun, 15 Jan 2023 13:25:41 +0800 Subject: xz: upgrade 5.4.0 -> 5.4.1 Changelog: ========== * liblzma: - Fixed the return value of lzma_microlzma_encoder() if the LZMA options lc/lp/pb are invalid. Invalid lc/lp/pb options made the function return LZMA_STREAM_END without encoding anything instead of returning LZMA_OPTIONS_ERROR. - Windows / Visual Studio: Workaround a possible compiler bug when targeting 32-bit x86 and compiling the CLMUL version of the CRC64 code. The CLMUL code isn't enabled by the Windows project files but it is in the CMake-based builds. * Build systems: - Windows-specific CMake changes: * Don't try to enable CLMUL CRC64 code if _mm_set_epi64x() isn't available. This fixes CMake-based build with Visual Studio 2013. * Created a workaround for a build failure with windres from GNU binutils. It is used only when the C compiler is GCC (not Clang). The workaround is incompatible with llvm-windres, resulting in "XZx20Utils" instead of "XZ Utils" in the resource file, but without the workaround llvm-windres works correctly. See the comment in CMakeLists.txt for details. * Included the resource files in the xz and xzdec build rules. Building the command line tools is still experimental but possible with MinGW-w64. - Visual Studio: Added stream_decoder_mt.c to the project files. Now the threaded decompressor lzma_stream_decoder_mt() gets built. CMake-based build wasn't affected. - Updated windows/INSTALL-MSVC.txt to mention that CMake-based build is now the preferred method with Visual Studio. The project files will probably be removed after 5.4.x releases. - Changes to #defines in config.h: * HAVE_DECL_CLOCK_MONOTONIC was replaced by HAVE_CLOCK_MONOTONIC. The old macro was always defined in configure-generated config.h to either 0 or 1. The new macro is defined (to 1) only if the declaration of CLOCK_MONOTONIC is available. This matches the way most other config.h macros work and makes things simpler with other build systems. * HAVE_DECL_PROGRAM_INVOCATION_NAME was replaced by HAVE_PROGRAM_INVOCATION_NAME for the same reason. * Tests: - Fixed test script compatibility with ancient /bin/sh versions. Now the five test_compress_* tests should no longer fail on Solaris 10. - Added and refactored a few tests. * Translations: - Updated the Catalan and Esperanto translations. - Added Korean and Ukrainian man page translations. (From OE-Core rev: bf829fec65b5f5047a4139ede8c4c2982ba81f1c) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-extended/xz/xz_5.4.0.bb | 44 ------------------------------------ meta/recipes-extended/xz/xz_5.4.1.bb | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-extended/xz/xz_5.4.0.bb create mode 100644 meta/recipes-extended/xz/xz_5.4.1.bb diff --git a/meta/recipes-extended/xz/xz_5.4.0.bb b/meta/recipes-extended/xz/xz_5.4.0.bb deleted file mode 100644 index 75b763533f..0000000000 --- a/meta/recipes-extended/xz/xz_5.4.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Utilities for managing LZMA compressed files" -HOMEPAGE = "https://tukaani.org/xz/" -DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." -SECTION = "base" - -# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the -# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our -# packages, and the LGPL bits are under lib/, which appears to be used for -# libgnu, which appears to be used for DOS builds. So we're left with -# GPL-2.0-or-later and PD. -LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" -LICENSE:${PN} = "GPL-2.0-or-later" -LICENSE:${PN}-dev = "GPL-2.0-or-later" -LICENSE:${PN}-staticdev = "GPL-2.0-or-later" -LICENSE:${PN}-doc = "GPL-2.0-or-later" -LICENSE:${PN}-dbg = "GPL-2.0-or-later" -LICENSE:${PN}-locale = "GPL-2.0-or-later" -LICENSE:liblzma = "PD" - -LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \ - file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ - file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ - " - -SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz" -SRC_URI[sha256sum] = "7471ef5991f690268a8f2be019acec2e0564b7b233ca40035f339fe9a07f830b" -UPSTREAM_CHECK_REGEX = "xz-(?P\d+(\.\d+)+)\.tar" - -CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh" - -inherit autotools gettext - -PACKAGES =+ "liblzma" - -FILES:liblzma = "${libdir}/liblzma*${SOLIBS}" - -inherit update-alternatives -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "xz xzcat unxz \ - lzma lzcat unlzma" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/xz/xz_5.4.1.bb b/meta/recipes-extended/xz/xz_5.4.1.bb new file mode 100644 index 0000000000..71bf4b540a --- /dev/null +++ b/meta/recipes-extended/xz/xz_5.4.1.bb @@ -0,0 +1,44 @@ +SUMMARY = "Utilities for managing LZMA compressed files" +HOMEPAGE = "https://tukaani.org/xz/" +DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." +SECTION = "base" + +# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the +# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our +# packages, and the LGPL bits are under lib/, which appears to be used for +# libgnu, which appears to be used for DOS builds. So we're left with +# GPL-2.0-or-later and PD. +LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" +LICENSE:${PN} = "GPL-2.0-or-later" +LICENSE:${PN}-dev = "GPL-2.0-or-later" +LICENSE:${PN}-staticdev = "GPL-2.0-or-later" +LICENSE:${PN}-doc = "GPL-2.0-or-later" +LICENSE:${PN}-dbg = "GPL-2.0-or-later" +LICENSE:${PN}-locale = "GPL-2.0-or-later" +LICENSE:liblzma = "PD" + +LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \ + file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ + file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \ + " + +SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz" +SRC_URI[sha256sum] = "e4b0f81582efa155ccf27bb88275254a429d44968e488fc94b806f2a61cd3e22" +UPSTREAM_CHECK_REGEX = "xz-(?P\d+(\.\d+)+)\.tar" + +CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh" + +inherit autotools gettext + +PACKAGES =+ "liblzma" + +FILES:liblzma = "${libdir}/liblzma*${SOLIBS}" + +inherit update-alternatives +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "xz xzcat unxz \ + lzma lzcat unlzma" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf