Attachment 216901 Details for Bug 247100 – Patch for zstd v2

[patch] Patch for zstd v2

0001-zstd-v2.patch (text/plain), 3.99 KB, created by Daniel Engberg on 2020-07-31 07:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-07-31 07:34:17 UTC

Size: 3.99 KB

patch

obsolete

>From 6ca61cd557db9a16ff4b9f265dd83d0051786af0 Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Fri, 31 Jul 2020 09:33:00 +0200
>Subject: [PATCH] zstd-v2
>
>zstd-v2
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> archivers/zstd/Makefile                      | 29 ++++++++++++--------
> archivers/zstd/distinfo                      |  6 ++--
> archivers/zstd/files/patch-tests_meson.build | 19 +++++++++++++
> archivers/zstd/pkg-plist                     |  2 ++
> 4 files changed, 42 insertions(+), 14 deletions(-)
> create mode 100644 archivers/zstd/files/patch-tests_meson.build
>
>diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
>index da1e50f50a62..74015b2925cc 100644
>--- a/archivers/zstd/Makefile
>+++ b/archivers/zstd/Makefile
>@@ -3,35 +3,42 @@
> 
> PORTNAME=	zstd
> PORTVERSION=	1.4.5
>-DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	archivers
>+MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${DISTVERSION}/
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Fast real-time compression algorithm
> 
> LICENSE=	BSD3CLAUSE GPLv2
> LICENSE_COMB=	dual
>-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
>-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
>+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/../../LICENSE
>+LICENSE_FILE_GPLv2=	${WRKSRC}/../../COPYING
> 
>-OPTIONS_DEFINE=	LZ4
>+TEST_DEPENDS=	gmd5sum:sysutils/coreutils
>+
>+USES=		meson pkgconfig python:3.4+,build shebangfix
>+
>+SHEBANG_FILES=	GetZstdLibraryVersion.py \
>+		InstallSymlink.py \
>+
>+OPTIONS_DEFINE=	LZ4 OPTIMIZED_CFLAGS TEST
> OPTIONS_DEFAULT=LZ4
> 
>-USES=		gmake
>+MESON_ARGS=	-Ddefault_library=both
> 
>-ALL_TARGET=	default
>-TEST_TARGET=	test
> USE_LDCONFIG=	yes
> 
>+WRKSRC_SUBDIR=	build/meson
>+
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> 
>-GH_ACCOUNT=	facebook
>-USE_GITHUB=	yes
>+OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
> 
> LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
> LZ4_USES=		localbase:ldflags
>+LZ4_MESON_ENABLED=	lz4
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|INSTALL_|BSD_&|' ${WRKSRC}/lib/Makefile ${WRKSRC}/programs/Makefile
>+TEST_MESON_TRUE=	bin_tests
> 
> .include <bsd.port.mk>
>diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo
>index 88bbb026fdba..c059cbc693ba 100644
>--- a/archivers/zstd/distinfo
>+++ b/archivers/zstd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1590421090
>-SHA256 (facebook-zstd-v1.4.5_GH0.tar.gz) = 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
>-SIZE (facebook-zstd-v1.4.5_GH0.tar.gz) = 1987927
>+TIMESTAMP = 1596179551
>+SHA256 (zstd-1.4.5.tar.gz) = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
>+SIZE (zstd-1.4.5.tar.gz) = 1973695
>diff --git a/archivers/zstd/files/patch-tests_meson.build b/archivers/zstd/files/patch-tests_meson.build
>new file mode 100644
>index 000000000000..bb093d551c41
>--- /dev/null
>+++ b/archivers/zstd/files/patch-tests_meson.build
>@@ -0,0 +1,19 @@
>+--- tests/meson.build.orig	2020-06-08 14:30:42 UTC
>++++ tests/meson.build
>+@@ -143,16 +143,6 @@ checkTag = executable('checkTag',
>+ # Tests (Use "meson test --list" to list all tests)
>+ # =============================================================================
>+ 
>+-if tests_supported_oses.contains(host_machine_os)
>+-  valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: true)
>+-  valgrindTest_py = files('valgrindTest.py')
>+-  test('valgrindTest',
>+-    valgrindTest_py,
>+-    args: [valgrind_prog.path(), zstd, datagen, fuzzer, fullbench],
>+-    depends: [zstd, datagen, fuzzer, fullbench],
>+-    timeout: 600) # Timeout should work on HDD drive
>+-endif
>+-
>+ if host_machine_os != os_windows
>+   playTests_sh = find_program(join_paths(zstd_rootdir, 'tests/playTests.sh'), required: true)
>+   test('test-zstd',
>diff --git a/archivers/zstd/pkg-plist b/archivers/zstd/pkg-plist
>index 76ac01e45772..c8f67bfc93fd 100644
>--- a/archivers/zstd/pkg-plist
>+++ b/archivers/zstd/pkg-plist
>@@ -1,5 +1,6 @@
> bin/unzstd
> bin/zstd
>+bin/zstd-frugal
> bin/zstdcat
> bin/zstdgrep
> bin/zstdless
>@@ -18,3 +19,4 @@ man/man1/zstd.1.gz
> man/man1/zstdcat.1.gz
> man/man1/zstdgrep.1.gz
> man/man1/zstdless.1.gz
>+man/man1/zstdmt.1.gz
>-- 
>2.27.0
>

Actions: View | Diff

Attachments on bug 247100: 215381 | 216901