Diff below updates zstd to 1.5.0, which is a major release featuring
large performance improvements as well as API changes. Overview on
changes can be found at
https://github.com/facebook/zstd/releases/tag/v1.5.0.
Changes to the port:
- Bumped major of libzstd because of removal of symbols
- Synced patches
Testing:
- 'make test' runs successful
- Run with several consumers
- Build tested consumers listed by:
echo "select fullpkgpath from depends where dependspath='archivers/zstd'" |
sqlite3 /usr/local/share/sqlports
Comments/OK?
diff --git Makefile Makefile
index 5d870dca9ef..063fcc3cb1a 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,10 @@
COMMENT = zstandard fast real-time compression algorithm
-V = 1.4.9
+V = 1.5.0
DISTNAME = zstd-${V}
-SHARED_LIBS = zstd 5.0 # 1.4.9
+SHARED_LIBS = zstd 6.0 # 1.5.0
CATEGORIES = archivers
diff --git distinfo distinfo
index 1560e8c4b44..6753a634ff2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.4.9.tar.gz) = Kax04Z6ihlkBc2GXYkDEtcXCTbO4kzhzGm/rl8A40pM=
-SIZE (zstd-1.4.9.tar.gz) = 1821109
+SHA256 (zstd-1.5.0.tar.gz) = UZT7+ngfz0W5jF6EllGqezsKAIxrctSg23YPMAIpHpQ=
+SIZE (zstd-1.5.0.tar.gz) = 1851389
diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
index 07e5f754160..0ea7011ec09 100644
--- patches/patch-lib_Makefile
+++ patches/patch-lib_Makefile
@@ -7,7 +7,7 @@ $OpenBSD: patch-lib_Makefile,v 1.11 2021/03/06 19:31:22 bket
Exp $
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -52,7 +52,7 @@ endif
+@@ -55,7 +55,7 @@ endif
CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
-DDYNAMIC_BMI2=0 -DNDEBUG
else
@@ -16,7 +16,7 @@ Index: lib/Makefile
endif
DEBUGLEVEL ?= 0
-@@ -63,7 +63,7 @@ endif
+@@ -66,7 +66,7 @@ endif
DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-Wstrict-prototypes -Wundef -Wpointer-arith \
@@ -25,12 +25,12 @@ Index: lib/Makefile
-Wredundant-decls -Wmissing-prototypes -Wc++-compat
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
FLAGS = $(CPPFLAGS) $(CFLAGS)
-@@ -428,8 +428,6 @@ install-shared:
+@@ -456,8 +456,6 @@ install-shared:
[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
@echo Installing shared library
$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
- ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
- ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+ .PHONY: install-includes
install-includes:
- [ -e $(DESTDIR)$(INCLUDEDIR) ] || $(INSTALL) -d -m 755
$(DESTDIR)$(INCLUDEDIR)/
diff --git patches/patch-tests_Makefile patches/patch-tests_Makefile
index e353a9d57ee..11cd4ef92f7 100644
--- patches/patch-tests_Makefile
+++ patches/patch-tests_Makefile
@@ -5,12 +5,12 @@ Some compilers don't have -Wvla
Index: tests/Makefile
--- tests/Makefile.orig
+++ tests/Makefile
-@@ -36,7 +36,7 @@ CFLAGS ?= -O3
+@@ -37,7 +37,7 @@ CFLAGS ?= -O3
CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow
\
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement
\
-Wstrict-prototypes -Wundef
\
- -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings
\
+ -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
- -Wredundant-decls -Wmissing-prototypes
+ -Wredundant-decls -Wmissing-prototypes
-Wno-deprecated-declarations
CFLAGS += $(DEBUGFLAGS)
CPPFLAGS += $(MOREFLAGS)
