cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to zstd-1.3.4.

Browse Source 
Bumped major number of shared lib as symbols have been removed, and
added.

OK juanfra@, sthen@, kn@
This commit is contained in:
bket 2018-04-04 16:10:02 +00:00
parent a84e78f998
commit 22880ecbe7
6 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archivers/zstd/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2018/01/14 10:30:28 juanfra Exp $
# $OpenBSD: Makefile,v 1.16 2018/04/04 16:10:02 bket Exp $
COMMENT = zstandard fast real-time compression algorithm
GH_ACCOUNT = facebook
GH_PROJECT = zstd
GH_TAGNAME = v1.3.3
REVISION = 0
SHARED_LIBS = zstd 0.0 #1.3.3
GH_TAGNAME = v1.3.4
SHARED_LIBS = zstd 1.0 # 1.3.4
CATEGORIES = archivers
@ -17,7 +16,7 @@ MAINTAINER = Bjorn Ketelaars <bjorn.ketelaars@hydroxide.nl>
# BSD 3 clauses + GPLv2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c lz4 lzma pthread z
WANTLIB = c lz4 lzma pthread z
LIB_DEPENDS = archivers/lz4 \
archivers/xz
@ -27,7 +26,7 @@ COMPILER_LANGS = c
MAKE_ENV = CC="${CC}" \
CFLAGS="${CFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
CPPFLAGS="-I${WRKSRC}/lib -I${LOCALBASE}/include" \
CXX="${CXX}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib" \

4
archivers/zstd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zstd-1.3.3.tar.gz) = p3xHFT7n3gJibFsqCXAFeGtxaIvmHp+4GAagEfkLKXs=
SIZE (zstd-1.3.3.tar.gz) = 1857232
SHA256 (zstd-1.3.4.tar.gz) = kuQbbo3Sa71GJI6KodhvFVG8Ihp5Yneuk2KVTybWBak=
SIZE (zstd-1.3.4.tar.gz) = 2059958

4
archivers/zstd/patches/patch-Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.1 2018/01/04 14:47:20 sthen Exp $
$OpenBSD: patch-Makefile,v 1.2 2018/04/04 16:10:02 bket Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -107,7 +107,7 @@ clean:
@@ -120,7 +120,7 @@ clean:
#------------------------------------------------------------------------------
# make install is validated only for Linux, OSX, Hurd and some BSD targets
#------------------------------------------------------------------------------

14
archivers/zstd/patches/patch-examples_Makefile Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-examples_Makefile,v 1.1 2018/04/04 16:10:02 bket Exp $
Index: examples/Makefile
--- examples/Makefile.orig
+++ examples/Makefile
@@ -22,7 +22,7 @@ all: simple_compression simple_decompression \
multiple_streaming_compression streaming_memory_usage
$(LIB) :
- make -C ../lib libzstd.a
+ $(MAKE) -C ../lib libzstd.a
simple_compression : simple_compression.c $(LIB)
$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@

19
archivers/zstd/patches/patch-lib_dictBuilder_cover_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-lib_dictBuilder_cover_c,v 1.1 2018/04/04 16:10:02 bket Exp $
zstd doesn't play nice with libc's qsort(). Reason is that qsort() is not
guaranteed to be stable. Proposed fix is to use libc's mergesort() instead.
https://github.com/facebook/zstd/issues/1088
Index: lib/dictBuilder/cover.c
--- lib/dictBuilder/cover.c.orig
+++ lib/dictBuilder/cover.c
@@ -583,7 +583,7 @@ static int COVER_ctx_init(COVER_ctx_t *ctx, const void
}
/* qsort doesn't take an opaque pointer, so pass as a global */
g_ctx = ctx;
- qsort(ctx->suffix, ctx->suffixSize, sizeof(U32),
+ mergesort(ctx->suffix, ctx->suffixSize, sizeof(U32),
(ctx->d <= 8 ? &COVER_strict_cmp8 : &COVER_strict_cmp));
}
DISPLAYLEVEL(2, "Computing frequencies\n");

4
archivers/zstd/patches/patch-tests_playTests_sh
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tests_playTests_sh,v 1.8 2018/01/04 14:47:20 sthen Exp $
$OpenBSD: patch-tests_playTests_sh,v 1.9 2018/04/04 16:10:02 bket Exp $
Index: tests/playTests.sh
--- tests/playTests.sh.orig
+++ tests/playTests.sh
@ -10,7 +10,7 @@ Index: tests/playTests.sh
*) MD5SUM="md5sum" ;;
esac
@@ -237,7 +238,7 @@ rm ./*.tmp ./*.zstd
@@ -258,7 +259,7 @@ rm ./*.tmp ./*.zstd
$ECHO "frame concatenation tests completed"