summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2021-01-03 14:55:50 +0000
committeradam <adam@pkgsrc.org>2021-01-03 14:55:50 +0000
commit7beadb233c2ca0acb49b9761f57e88442e92df60 (patch)
tree3e6282ba2ace83d4d65bacce73e463d8bbfde503
parente4b6d420cbe0a8323ec8284c7a3d8915b99202f0 (diff)
downloadpkgsrc-7beadb233c2ca0acb49b9761f57e88442e92df60.tar.gz
zstd: updated to 1.4.8
v1.4.8 hotfix: wrong alignment of an internal buffer v1.4.7 perf: stronger --long mode at high compression levels perf: stronger --patch-from at high compression levels, thanks to --long improvements perf: faster dictionary compression at medium compression levels perf: small speed & memory usage improvements for ZSTD_compress2() perf: improved fast compression speeds with Visual Studio cli : Set nb of threads with environment variable ZSTD_NBTHREADS cli : accept decompressing files with *.zstd suffix cli : provide a condensed summary by default when processing multiple files cli : fix : stdin input no longer confused as user prompt cli : improve accuracy of several error messages api : new sequence ingestion API api : shared thread pool: control total nb of threads used by multiple compression jobs api : new ZSTD_getDictID_fromCDict() api : zlibWrapper only uses public API, and is compatible with dynamic library api : fix : multithreaded compression has predictable output even in special cases api : fix : dictionary compression correctly respects dictionary compression level build: fix cmake script when using path with spaces build: improved compile-time detection of aarch64/neon platforms build: Fix building on AIX 5.1 build: compile paramgrill with cmake on Windows, requested by @mirh doc : clarify repcode updates in format specification v1.4.6 fix : Always return dstSize_tooSmall when that is the case fix : Fix ZSTD_initCStream_advanced() with static allocation and no dictionary perf: Improve small block decompression speed by 20%+ perf: Reduce compression stack usage by 1 KB perf: Improve decompression speed by improving ZSTD_wildcopy perf: Improve histogram construction cli : Add --output-dir-mirror option cli : Warn when (de)compressing multiple files into a single output cli : Improved progress bar and status summary when (de)compressing multiple files cli : Call stat less often cli : Allow --patch-from XXX and --filelist XXX in addition to --patch-from=XXX and --filelist=XXX cli : Allow --patch-from to compress stdin with --stream-size api : Do not install zbuff.h, since it has long been deprecated api : Fix ZSTD_CCtx_setParameter() with ZSTD_c_compressionLevel to make 0 mean default level api : Rename ZSTDMT_NBTHREADS_MAX to ZSTDMT_NBWORKERS_MAX build: Install pkg-config file with CMake and MinGW build: Install DLL with CMake on Windows build: Fix DLL install location with CMake build: Add ZSTD_NO_UNUSED_FUNCTIONS macro to hide unused functions build: Add ZSTD_NO_INTRINSICS macro to avoid explicit intrinsics build: Add STATIC_BMI2 macro for compile time detection of BMI2 on MSVC build: Fix -Wcomma warnings build: Remove distutils requirement for meson build build: Fix cli compilation with uclibc build: Fix cli compilation without st_mtime build: Fix shadowing warnings in library build: Fix single file library compilation with Enscripten misc: Improve single file library and include dictBuilder misc: Allow compression dictionaries with missing symbols misc: Add freestanding translation script in contrib/freestanding_lib misc: Collect all of zstd's libc dependencies into zstd_deps.h doc : Add ZSTD_versionString() to manual doc : Fix documentation for ZSTD_CCtxParams_setParameter()
-rw-r--r--archivers/zstd/Makefile7
-rw-r--r--archivers/zstd/PLIST3
-rw-r--r--archivers/zstd/distinfo16
-rw-r--r--archivers/zstd/patches/patch-Makefile8
-rw-r--r--archivers/zstd/patches/patch-lib_Makefile50
-rw-r--r--archivers/zstd/patches/patch-programs_Makefile22
6 files changed, 53 insertions, 53 deletions
diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 61ac89c72bd..ffa284e5a1b 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/10/01 07:25:06 mcf Exp $
+# $NetBSD: Makefile,v 1.32 2021/01/03 14:55:50 adam Exp $
-DISTNAME= zstd-1.4.5
-PKGREVISION= 1
+DISTNAME= zstd-1.4.8
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=facebook/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -14,7 +13,7 @@ LICENSE= modified-bsd OR gnu-gpl-v2
CHECK_PORTABILITY_SKIP+= tests/playTests.sh
# 1.4.5: ../lib/libzstd.so: file not recognized: file format not recognized
-MAKE_JOBS_SAFE= no
+#MAKE_JOBS_SAFE= no
USE_LANGUAGES= c c++
USE_TOOLS+= ggrep gmake pkg-config
diff --git a/archivers/zstd/PLIST b/archivers/zstd/PLIST
index a97f22ec8f0..286ae0d355c 100644
--- a/archivers/zstd/PLIST
+++ b/archivers/zstd/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/22 15:28:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/01/03 14:55:50 adam Exp $
bin/unzstd
bin/zstd
bin/zstdcat
bin/zstdgrep
bin/zstdless
bin/zstdmt
-include/zbuff.h
include/zdict.h
include/zstd.h
include/zstd_errors.h
diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
index e82f5f36f78..c572c95d4ca 100644
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2020/10/01 07:25:06 mcf Exp $
+$NetBSD: distinfo,v 1.26 2021/01/03 14:55:50 adam Exp $
-SHA1 (zstd-1.4.5.tar.gz) = 9c344c2660c990b6d6a9cced73db3a0dfe2b0092
-RMD160 (zstd-1.4.5.tar.gz) = b7b9df3d4293eab050f84d2fc7f0a29c89905e87
-SHA512 (zstd-1.4.5.tar.gz) = b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-Size (zstd-1.4.5.tar.gz) = 1987927 bytes
-SHA1 (patch-Makefile) = daf9d1946513ee24a4c4c187ec80878e9a578744
-SHA1 (patch-lib_Makefile) = 07196103e013532ac60e1ce6dfc9f61de3367287
-SHA1 (patch-programs_Makefile) = 2500df468c2994f1b33165c5d2774817bdc8addc
+SHA1 (zstd-1.4.8.tar.gz) = e3027d788b964429c773fab05e000061dc6eb3f6
+RMD160 (zstd-1.4.8.tar.gz) = 94aa90fff2a52a5c0314a19d2a59903ac760eada
+SHA512 (zstd-1.4.8.tar.gz) = 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
+Size (zstd-1.4.8.tar.gz) = 1816546 bytes
+SHA1 (patch-Makefile) = e1e702cd3b461d432e25909fdcf01cc51c769a8a
+SHA1 (patch-lib_Makefile) = 8d31689c4bf9dd97b82f01396ef6b58cb29fd80e
+SHA1 (patch-programs_Makefile) = 9d57ba124fc2b243d6fcb8bfb744c2d39ac89e0e
SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec
diff --git a/archivers/zstd/patches/patch-Makefile b/archivers/zstd/patches/patch-Makefile
index 97eaf1c0847..38c748bc1f9 100644
--- a/archivers/zstd/patches/patch-Makefile
+++ b/archivers/zstd/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.8 2018/10/07 06:25:30 adam Exp $
+$NetBSD: patch-Makefile,v 1.9 2021/01/03 14:55:50 adam Exp $
Enable the "install" target on all OS.
---- Makefile.orig 2018-10-05 16:34:52.000000000 +0000
+--- Makefile.orig 2020-12-19 00:39:42.000000000 +0000
+++ Makefile
-@@ -113,7 +113,6 @@ clean:
+@@ -149,7 +149,6 @@ clean:
#------------------------------------------------------------------------------
# make install is validated only for Linux, macOS, Hurd and some BSD targets
#------------------------------------------------------------------------------
@@ -12,7 +12,7 @@ Enable the "install" target on all OS.
HOST_OS = POSIX
CMAKE_PARAMS = -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_BUILD_STATIC:BOOL=ON -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON -DZSTD_LZMA_SUPPORT:BOOL=ON -DCMAKE_BUILD_TYPE=Release
-@@ -319,7 +318,6 @@ clang38install:
+@@ -356,7 +355,6 @@ clang38install:
lz4install:
[ -e lz4 ] || git clone https://github.com/lz4/lz4 && sudo $(MAKE) -C lz4 install
diff --git a/archivers/zstd/patches/patch-lib_Makefile b/archivers/zstd/patches/patch-lib_Makefile
index 34bbea6eba7..dd4b7137710 100644
--- a/archivers/zstd/patches/patch-lib_Makefile
+++ b/archivers/zstd/patches/patch-lib_Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-lib_Makefile,v 1.10 2020/10/01 07:25:06 mcf Exp $
+$NetBSD: patch-lib_Makefile,v 1.11 2021/01/03 14:55:50 adam Exp $
Detect and use third-party libraries (taken from programs/Makefile).
-fvisibility=hidden makes error when linking.
Enable the "install" target on all OS.
Fix pkgconfig installation path.
---- lib/Makefile.orig 2020-05-22 05:04:00.000000000 +0000
+--- lib/Makefile.orig 2020-12-19 00:39:42.000000000 +0000
+++ lib/Makefile
-@@ -165,6 +165,43 @@ CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZST
+@@ -193,6 +193,43 @@ endif
+ endif # BUILD_DIR
- ZSTD_OBJ := $(patsubst %.c,%.o,$(ZSTD_FILES))
+VOID = /dev/null
+
@@ -50,39 +50,39 @@ Fix pkgconfig installation path.
+
# macOS linker doesn't support -soname, and use different extension
# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
- ifeq ($(shell uname), Darwin)
-@@ -204,7 +241,8 @@ $(LIBZSTD): $(ZSTD_FILES)
- else
-
+ ifeq ($(UNAME), Darwin)
+@@ -259,7 +296,8 @@ else # not Windows
LIBZSTD = libzstd.$(SHARED_EXT_VER)
--$(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ .PHONY: $(LIBZSTD) # must be run every time
+ $(LIBZSTD): CFLAGS += -fPIC
+-$(LIBZSTD): LDFLAGS += -shared -fvisibility=hidden
+$(LIBZSTD): CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
-+$(LIBZSTD): LDFLAGS += -shared -fPIC $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
- $(LIBZSTD): $(ZSTD_FILES)
- @echo compiling dynamic library $(LIBVER)
- $(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-@@ -251,7 +289,6 @@ clean:
++$(LIBZSTD): LDFLAGS += -shared $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD)
+
+ ifndef BUILD_DIR
+ # determine BUILD_DIR from compilation flags
+@@ -349,7 +387,6 @@ clean:
#-----------------------------------------------------------------------------
# make install is validated only for below listed environments
#-----------------------------------------------------------------------------
--ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
+-ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
all: libzstd.pc
-@@ -287,11 +324,7 @@ $(error configured includedir ($(INCLUDE
- endif
- endif
+@@ -380,11 +417,7 @@ PCLIBPREFIX := $(if $(findstring $(LIBDI
+ # to PREFIX, rather than as a resolved value.
+ PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix})
--ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
--PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
+-ifneq (,$(filter $(UNAME),FreeBSD NetBSD DragonFly))
+- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
-else
- PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
+ PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
-endif
- ifneq (,$(filter $(shell uname),SunOS))
- INSTALL ?= ginstall
-@@ -351,4 +384,3 @@ uninstall:
- $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
+ ifneq (,$(filter $(UNAME),SunOS))
+ INSTALL ?= ginstall
+@@ -448,4 +481,3 @@ uninstall:
+ $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
@echo zstd libraries successfully uninstalled
-endif
diff --git a/archivers/zstd/patches/patch-programs_Makefile b/archivers/zstd/patches/patch-programs_Makefile
index cc620ed91ca..722cc238a13 100644
--- a/archivers/zstd/patches/patch-programs_Makefile
+++ b/archivers/zstd/patches/patch-programs_Makefile
@@ -1,21 +1,23 @@
-$NetBSD: patch-programs_Makefile,v 1.7 2020/06/14 13:51:55 adam Exp $
+$NetBSD: patch-programs_Makefile,v 1.8 2021/01/03 14:55:50 adam Exp $
Use zstd shared library.
---- programs/Makefile.orig 2020-05-22 05:04:00.000000000 +0000
+--- programs/Makefile.orig 2020-12-19 00:39:42.000000000 +0000
+++ programs/Makefile
-@@ -172,12 +172,12 @@ zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT
- ifneq (,$(filter Windows%,$(OS)))
- zstd : $(RES_FILE)
- endif
--zstd : $(ZSTDLIB_FILES) $(ZSTD_CLI_OBJ)
-+zstd : $(ZSTD_CLI_OBJ)
+@@ -222,14 +222,14 @@ zstd:
+ else
+ # BUILD_DIR is defined
+
+-ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
++ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_CLI_OBJ))
+ $(BUILD_DIR)/zstd : $(ZSTD_OBJ)
@echo "$(THREAD_MSG)"
@echo "$(ZLIB_MSG)"
@echo "$(LZMA_MSG)"
@echo "$(LZ4_MSG)"
+ @echo LINK $@
- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS)
+ $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) -L$(ZSTDDIR) -lzstd
- .PHONY: zstd-release
- zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0
+ ifeq ($(HAVE_HASH),1)
+ SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ")