Skip to content

Commit 10ecbf8

Browse files
linusgnico
authored andcommitted
Ports: Update xz to 5.8.1
1 parent a451f8b commit 10ecbf8

4 files changed

Lines changed: 18 additions & 18 deletions

Ports/AvailablePorts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
355355
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.12.26 | https://github.com/FWGS/xash3d-fwgs |
356356
| [`xmp-cli`](xmp-cli/) | Extended Module Player | 4.2.0 | https://github.com/libxmp/xmp-cli |
357357
| [`xorriso`](xorriso/) | xorriso | 1.5.6 | https://www.gnu.org/software/xorriso |
358-
| [`xz`](xz/) | xz | 5.6.2 | https://tukaani.org/xz/ |
358+
| [`xz`](xz/) | xz | 5.8.1 | https://tukaani.org/xz/ |
359359
| [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ |
360360
| [`zig`](zig/) | Zig programming language | 0.16.0-dev.627+e6e4792a5 | https://ziglang.org/ |
361361
| [`zlib`](zlib/) | zlib | 1.3.1 | https://www.zlib.net/ |

Ports/xz/package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env -S bash ../.port_include.sh
22
port='xz'
3-
version='5.6.2'
3+
version='5.8.1'
44
depends=(
55
'libiconv'
66
'zlib'
77
)
88
files=(
9-
"https://tukaani.org/xz/xz-${version}.tar.gz#8bfd20c0e1d86f0402f2497cfa71c6ab62d4cd35fd704276e3140bfb71414519"
9+
"https://tukaani.org/xz/xz-${version}.tar.gz#507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543"
1010
)
1111
useconfigure='true'
1212
use_fresh_config_sub='true'

Ports/xz/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ static library into a shared library.
1717
1 file changed, 23 insertions(+)
1818

1919
diff --git a/configure b/configure
20-
index 897a25f77f257182ccd76245b447058199c3478b..aa9ea19199c408d8036c0a2d72d358ea9392b29e 100755
20+
index 4f89118495be24a8a5e228ad6ff00a6da9d58f9d..8849cd1ad50ec1015b0bcbd7bdce9d18e74e111f 100755
2121
--- a/configure
2222
+++ b/configure
23-
@@ -9810,6 +9810,10 @@ tpf*)
23+
@@ -10032,6 +10032,10 @@ tpf*)
2424
os2*)
2525
lt_cv_deplibs_check_method=pass_all
2626
;;
@@ -31,7 +31,7 @@ index 897a25f77f257182ccd76245b447058199c3478b..aa9ea19199c408d8036c0a2d72d358ea
3131
esac
3232
;;
3333
esac
34-
@@ -13338,6 +13342,10 @@ lt_prog_compiler_static=
34+
@@ -13663,6 +13667,10 @@ lt_prog_compiler_static=
3535
lt_prog_compiler_static='-Bstatic'
3636
;;
3737

@@ -42,7 +42,7 @@ index 897a25f77f257182ccd76245b447058199c3478b..aa9ea19199c408d8036c0a2d72d358ea
4242
*)
4343
lt_prog_compiler_can_build_shared=no
4444
;;
45-
@@ -14880,6 +14888,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
45+
@@ -15216,6 +15224,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
4646
hardcode_shlibpath_var=no
4747
;;
4848

@@ -53,7 +53,7 @@ index 897a25f77f257182ccd76245b447058199c3478b..aa9ea19199c408d8036c0a2d72d358ea
5353
*)
5454
ld_shlibs=no
5555
;;
56-
@@ -15955,6 +15967,17 @@ uts4*)
56+
@@ -16362,6 +16374,17 @@ uts4*)
5757
shlibpath_var=LD_LIBRARY_PATH
5858
;;
5959

@@ -68,6 +68,6 @@ index 897a25f77f257182ccd76245b447058199c3478b..aa9ea19199c408d8036c0a2d72d358ea
6868
+ dynamic_linker='SerenityOS LibELF'
6969
+ ;;
7070
+
71-
*)
72-
dynamic_linker=no
73-
;;
71+
emscripten*)
72+
version_type=none
73+
need_lib_prefix=no

Ports/xz/patches/0002-liblzma-Don-t-assume-getauxval-is-Linux-only.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ in the auxiliary vector.
1111
2 files changed, 2 insertions(+), 2 deletions(-)
1212

1313
diff --git a/src/liblzma/check/crc32_arm64.h b/src/liblzma/check/crc32_arm64.h
14-
index 39c1c63ec0eced25ad5042e1611ecd8064831d8d..bea249c9462c7298bce154a1228dba71c4f0e128 100644
14+
index fb0e8f0105a9e7ddf5abb3a8f8ef3bb2b48ab128..32072922d6b8e3cee8705d0169a1d083c8e08ad6 100644
1515
--- a/src/liblzma/check/crc32_arm64.h
1616
+++ b/src/liblzma/check/crc32_arm64.h
17-
@@ -78,7 +78,7 @@ crc32_arch_optimized(const uint8_t *buf, size_t size, uint32_t crc)
17+
@@ -103,7 +103,7 @@ crc32_arch_optimized(const uint8_t *buf, size_t size, uint32_t crc)
1818
static inline bool
1919
is_arch_extension_supported(void)
2020
{
@@ -24,15 +24,15 @@ index 39c1c63ec0eced25ad5042e1611ecd8064831d8d..bea249c9462c7298bce154a1228dba71
2424

2525
#elif defined(HAVE_ELF_AUX_INFO)
2626
diff --git a/src/liblzma/check/crc_common.h b/src/liblzma/check/crc_common.h
27-
index 63a7b5cefebffc506dc54a6378134008ead3c806..917bf98c9ce611fc946f8acad0c1cf31f2a2fdee 100644
27+
index 7ea1e60b043bf86dfe421e7594cb01812c51caa0..30a7b5c1a8f4185d76c926c3b41a5488b72ce6ed 100644
2828
--- a/src/liblzma/check/crc_common.h
2929
+++ b/src/liblzma/check/crc_common.h
30-
@@ -48,7 +48,7 @@
31-
#endif
32-
30+
@@ -89,7 +89,7 @@ extern const uint64_t lzma_crc64_table[4][256];
31+
// ARM64
32+
//
3333
// Keep this in sync with changes to crc32_arm64.h
3434
-#if defined(_WIN32) || defined(HAVE_GETAUXVAL) \
3535
+#if defined(_WIN32) || (defined(__linux__) && defined(HAVE_GETAUXVAL)) \
3636
|| defined(HAVE_ELF_AUX_INFO) \
3737
|| (defined(__APPLE__) && defined(HAVE_SYSCTLBYNAME))
38-
# define ARM64_RUNTIME_DETECTION 1
38+
# define CRC_ARM64_RUNTIME_DETECTION 1

0 commit comments

Comments
 (0)