summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Palamar <randy@rnpnr.xyz>2025-04-24 19:18:51 -0600
committerMichael Forney <mforney@mforney.org>2025-04-28 11:25:08 -0700
commitf4a3d5a6584a68b65f242c69d84b360db16f7a15 (patch)
tree6a2d59625b13b01ac93fe43f84e7b406b1f636c2
parent160dac1b758edf41aa1c78a2c6b9bc773ae743c9 (diff)
zstd: bump to 1.5.7
-rw-r--r--pkg/zstd/gen.lua4
-rw-r--r--pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch8
-rw-r--r--pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch26
m---------pkg/zstd/src0
-rw-r--r--pkg/zstd/ver2
5 files changed, 8 insertions, 32 deletions
diff --git a/pkg/zstd/gen.lua b/pkg/zstd/gen.lua
index 405ccccf..05d67710 100644
--- a/pkg/zstd/gen.lua
+++ b/pkg/zstd/gen.lua
@@ -35,9 +35,11 @@ lib('libzstd.a', [[lib/(
zstd_lazy.c
zstd_ldm.c
zstd_opt.c
+ zstd_preSplit.c
zstdmt_compress.c
)
decompress/(
+ @x86_64 huf_decompress_amd64.S
huf_decompress.c
zstd_ddict.c
zstd_decompress.c
@@ -46,7 +48,7 @@ lib('libzstd.a', [[lib/(
)]])
exe('zstd', [[
- programs/(zstdcli.c util.c timefn.c fileio.c)
+ programs/(zstdcli.c util.c timefn.c fileio.c fileio_asyncio.c)
libzstd.a
]])
file('bin/zstd', '755', '$outdir/zstd')
diff --git a/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch b/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch
index f3edce2b..dec7ee6c 100644
--- a/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch
+++ b/pkg/zstd/patch/0001-Only-use-__asm__-on-GNU-compatible-compilers.patch
@@ -1,4 +1,4 @@
-From 7bc019c4c96b4eae8fe05dd31c4ea781441d437c Mon Sep 17 00:00:00 2001
+From fe88b59e4028952b4d157f0934e14b9eed058cd9 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 10 Jun 2019 01:47:01 -0700
Subject: [PATCH] Only use __asm__ on GNU-compatible compilers
@@ -8,10 +8,10 @@ Subject: [PATCH] Only use __asm__ on GNU-compatible compilers
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/common/cpu.h b/lib/common/cpu.h
-index cb210593..3c43f816 100644
+index 3f15d560..8d73a2ab 100644
--- a/lib/common/cpu.h
+++ b/lib/common/cpu.h
-@@ -82,7 +82,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
+@@ -118,7 +118,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
: "a"(7), "c"(0)
: "edx");
}
@@ -21,5 +21,5 @@ index cb210593..3c43f816 100644
__asm__("cpuid" : "=a"(n) : "a"(0) : "ebx", "ecx", "edx");
if (n >= 1) {
--
-2.29.2
+2.45.2
diff --git a/pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch b/pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch
deleted file mode 100644
index 6aa02e0a..00000000
--- a/pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0f2837d010dce1f0a384c3ba6f54a86f39c607d5 Mon Sep 17 00:00:00 2001
-From: Dan Nelson <dnelson_1901@yahoo.com>
-Date: Sat, 15 May 2021 10:20:37 -0500
-Subject: [PATCH] ZSTD_VecMask_next: fix incorrect variable name in fallback
- code path
-
----
- lib/compress/zstd_lazy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c
-index 3d523e84..9e13f37c 100644
---- a/lib/compress/zstd_lazy.c
-+++ b/lib/compress/zstd_lazy.c
-@@ -1081,7 +1081,7 @@ static U32 ZSTD_VecMask_next(ZSTD_VecMask val) {
- 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
- 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
- };
-- return multiplyDeBruijnBitPosition[((U32)((v & -(int)v) * 0x077CB531U)) >> 27];
-+ return multiplyDeBruijnBitPosition[((U32)((val & -(int)val) * 0x077CB531U)) >> 27];
- # endif
- }
-
---
-2.31.1
-
diff --git a/pkg/zstd/src b/pkg/zstd/src
-Subproject a488ba114ec17ea1054b9057c26a046fc122b3b
+Subproject f8745da6ff1ad1e7bab384bd1f9d742439278e9
diff --git a/pkg/zstd/ver b/pkg/zstd/ver
index c9407383..a8b3dc59 100644
--- a/pkg/zstd/ver
+++ b/pkg/zstd/ver
@@ -1 +1 @@
-1.5.0 r1
+1.5.7 r0