diff --git a/.abf.yml b/.abf.yml index 0b807f4..9fd5c23 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - zstd-1.4.4.tar.gz: 8ec1a47b704001c1804b8670a3c86f4baf035c07 + zstd-1.4.5.tar.gz: 9c344c2660c990b6d6a9cced73db3a0dfe2b0092 diff --git a/pzstd.1.patch b/pzstd.1.patch deleted file mode 100644 index c0c451a..0000000 --- a/pzstd.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur zstd-1.4.4.orig/programs/zstd.1 zstd-1.4.4/programs/zstd.1 ---- zstd-1.4.4.orig/programs/zstd.1 2019-11-04 17:54:32.000000000 +0000 -+++ zstd-1.4.4/programs/zstd.1 2020-01-15 14:25:34.227060058 +0000 -@@ -209,6 +209,14 @@ - .TP - \fB\-\-\fR - All arguments after \fB\-\-\fR are treated as files -+ -+.SH Parallel Zstd OPTIONS -+Additional options for the pzstd utility -+.TP -+.BR \-p ", " --processes -+ number of threads to use for (de)compression (default:4) -+ -+ - . - .SS "Restricted usage of Environment Variables" - Using environment variables to set parameters has security implications\. Therefore, this avenue is intentionally restricted\. Only \fBZSTD_CLEVEL\fR is supported currently, for setting compression level\. \fBZSTD_CLEVEL\fR can be used to set the level between 1 and 19 (the "normal" range)\. If the value of \fBZSTD_CLEVEL\fR is not a valid integer, it will be ignored with a warning message\. \fBZSTD_CLEVEL\fR just replaces the default compression level (\fB3\fR)\. It can be overridden by corresponding command line arguments\. diff --git a/zstd-1.3.4-multi-thread-default.patch b/zstd-1.3.4-multi-thread-default.patch index 025acfd..6efa9cb 100644 --- a/zstd-1.3.4-multi-thread-default.patch +++ b/zstd-1.3.4-multi-thread-default.patch @@ -1,8 +1,8 @@ -diff -Naur zstd-1.3.8/programs/zstdcli.c zstd-1.3.8/programs/new-zstdcli.c ---- zstd-1.3.8/programs/zstdcli.c 2018-12-27 13:42:44.000000000 +0100 -+++ zstd-1.3.8/programs/new-zstdcli.c 2019-01-01 04:30:50.000000000 +0100 -@@ -576,7 +576,7 @@ - cLevel = init_cLevel(); +diff -Naur zstd-1.4.5/programs/zstdcli.c zstd-1.4.5.tpg/programs/zstdcli.c +--- zstd-1.4.5/programs/zstdcli.c 2020-05-22 05:04:00.000000000 +0000 ++++ zstd-1.4.5.tpg/programs/zstdcli.c 2020-05-22 08:33:46.031001998 +0000 +@@ -695,7 +695,7 @@ + if ((filenames==NULL) || (file_of_names==NULL)) { DISPLAY("zstd: allocation error \n"); exit(1); } programName = lastNameFromPath(programName); #ifdef ZSTD_MULTITHREAD - nbWorkers = 1; @@ -10,4 +10,3 @@ diff -Naur zstd-1.3.8/programs/zstdcli.c zstd-1.3.8/programs/new-zstdcli.c #endif /* preset behaviors */ - diff --git a/zstd.spec b/zstd.spec index 35995a7..53db260 100644 --- a/zstd.spec +++ b/zstd.spec @@ -9,14 +9,13 @@ Summary: Zstd compression library Name: zstd -Version: 1.4.4 +Version: 1.4.5 Release: 1 License: BSD and GPLv2+ Group: Archiving/Compression Url: http://www.zstd.net/ Source0: https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: zstd-1.3.4-multi-thread-default.patch -Patch1: pzstd.1.patch BuildRequires: gtest-devel BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) @@ -66,6 +65,7 @@ Header files for Zstd library. %{_includedir}/*.h %{_libdir}/pkgconfig/libzstd.pc %{_libdir}/libzstd.so +%{_libdir}/cmake/%{name}/*.cmake #----------------------------------------------------------------------------