summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2024-03-30 16:54:03 +0100
committerØrjan Malde <red@foxi.me>2024-03-30 16:54:03 +0100
commitc2c63965fc36d25a27b5c0e1ee260730888e0196 (patch)
tree773030bd531a990109be1ed2a8ba01465f1c4341
parent992cd15815848b37576440c78cf098913e41570e (diff)
downloadmidipix_build-c2c63965fc36d25a27b5c0e1ee260730888e0196.tar.bz2
midipix_build-c2c63965fc36d25a27b5c0e1ee260730888e0196.tar.xz
groups.d/231.native_packages_etc.group: zstd: bump to v1.5.5
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups.d/231.native_packages_etc.group4
-rw-r--r--patches/zstd-1.3.4.local.patch21
-rw-r--r--patches/zstd-1.5.5.local.patch11
3 files changed, 13 insertions, 23 deletions
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 2119b630..745c8b86 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -553,8 +553,8 @@ vim_cv_timer_create=yes"};
: ${PKG_YABASIC_URL:=http://www.yabasic.de/download/yabasic-${PKG_YABASIC_VERSION}.tar.gz};
: ${PKG_YABASIC_CONFIG_CACHE_EXTRA:="ac_cv_func_strtod=yes"};
: ${PKG_YABASIC_DISABLED:=1};
-: ${PKG_ZSTD_SHA256SUM:=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9};
-: ${PKG_ZSTD_VERSION:=1.3.4};
+: ${PKG_ZSTD_SHA256SUM:=98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1};
+: ${PKG_ZSTD_VERSION:=1.5.5};
: ${PKG_ZSTD_URL:=https://github.com/facebook/zstd/archive/v${PKG_ZSTD_VERSION}.tar.gz};
: ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
: ${PKG_ZSTD_IN_TREE:=1};
diff --git a/patches/zstd-1.3.4.local.patch b/patches/zstd-1.3.4.local.patch
deleted file mode 100644
index 40e5250d..00000000
--- a/patches/zstd-1.3.4.local.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/programs/Makefile b/programs/Makefile
---- a/programs/Makefile 2018-03-26 22:19:34.000000000 +0000
-+++ b/programs/Makefile 2018-04-30 14:55:39.468000000 +0000
-@@ -38,7 +38,6 @@
- CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \
- -I$(ZSTDDIR)/dictBuilder \
- -DXXH_NAMESPACE=ZSTD_
--CFLAGS ?= -O3
- DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
- -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
- -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \
-diff -ru a/lib/libzstd.pc.in b/lib/libzstd.pc.in
---- a/lib/libzstd.pc.in 2020-03-27 11:36:13.368590549 -0400
-+++ b/lib/libzstd.pc.in 2020-03-27 11:36:28.362034466 -0400
-@@ -10,5 +10,5 @@
- Description: fast lossless compression algorithm library
- URL: http://www.zstd.net/
- Version: @VERSION@
--Libs: -L${libdir} -lzstd
-+Libs: -lzstd
- Cflags: -I${includedir}
diff --git a/patches/zstd-1.5.5.local.patch b/patches/zstd-1.5.5.local.patch
new file mode 100644
index 00000000..3075a43f
--- /dev/null
+++ b/patches/zstd-1.5.5.local.patch
@@ -0,0 +1,11 @@
+diff -ru zstd-1.5.5.orig/lib/libzstd.pc.in zstd-1.5.5/lib/libzstd.pc.in
+--- zstd-1.5.5.orig/lib/libzstd.pc.in 2023-04-04 22:13:52.000000000 +0200
++++ zstd-1.5.5/lib/libzstd.pc.in 2024-03-30 16:49:30.898203602 +0100
+@@ -11,6 +11,6 @@
+ Description: fast lossless compression algorithm library
+ URL: https://facebook.github.io/zstd/
+ Version: @VERSION@
+-Libs: -L${libdir} -lzstd
++Libs: -lzstd
+ Libs.private: @LIBS_PRIVATE@
+ Cflags: -I${includedir}