Attachment 238980 Details for Bug 268519 – Patch for libdeflate

[patch] Patch for libdeflate

libdeflate115.patch (text/plain), 4.56 KB, created by Daniel Engberg on 2022-12-22 22:48:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-12-22 22:48:30 UTC

Size: 4.56 KB

patch

obsolete

>diff --git a/archivers/libdeflate/Makefile b/archivers/libdeflate/Makefile
>index 0f8d236c45ac..33a05b8a336b 100644
>--- a/archivers/libdeflate/Makefile
>+++ b/archivers/libdeflate/Makefile
>@@ -1,8 +1,11 @@
> PORTNAME=	libdeflate
>-PORTVERSION=	1.14
> DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.15
> CATEGORIES=	archivers
> 
>+PATCH_SITES=	https://github.com/ebiggers/${PORTNAME}/commit/
>+PATCHFILES=	98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch:-p1
>+
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	Fast, whole-buffer DEFLATE-based compression library
> WWW=		https://github.com/ebiggers/libdeflate
>@@ -10,18 +13,15 @@ WWW=		https://github.com/ebiggers/libdeflate
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake
>+USES=		cmake:testing pathfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	ebiggers
> USE_LDCONFIG=	yes
> 
>-MAKE_ARGS=	V=1
>-TEST_TARGET=	check
>+CMAKE_TESTING_ON=	LIBDEFLATE_BUILD_TESTS
>+
>+CMAKE_ON=	LIBDEFLATE_USE_SHARED_LIB
> 
>-PLIST_FILES=	bin/libdeflate-gunzip bin/libdeflate-gzip \
>-		include/libdeflate.h \
>-		libdata/pkgconfig/libdeflate.pc \
>-		lib/libdeflate.a lib/libdeflate.so lib/libdeflate.so.0
> PORTDOCS=	NEWS.md README.md
> 
> OPTIONS_DEFINE=	DOCS
>diff --git a/archivers/libdeflate/distinfo b/archivers/libdeflate/distinfo
>index 3c91091c26a8..041d05366e6d 100644
>--- a/archivers/libdeflate/distinfo
>+++ b/archivers/libdeflate/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1662862430
>-SHA256 (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 89e7df898c37c3427b0f39aadcf733731321a278771d20fc553f92da8d4808ac
>-SIZE (ebiggers-libdeflate-v1.14_GH0.tar.gz) = 180182
>+TIMESTAMP = 1671744385
>+SHA256 (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b
>+SIZE (ebiggers-libdeflate-v1.15_GH0.tar.gz) = 180818
>+SHA256 (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 3b80183158aee9c01274258548a938bfa2bf4377ccfb0d6f3277424126068a37
>+SIZE (98174ac5e6fe2a806923bcb6bfa24cdbf32c79d0.patch) = 1502
>diff --git a/archivers/libdeflate/files/patch-CMakeLists.txt b/archivers/libdeflate/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..43f45cecac9b
>--- /dev/null
>+++ b/archivers/libdeflate/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2022-12-22 21:28:37 UTC
>++++ CMakeLists.txt
>+@@ -61,7 +61,7 @@ if(NOT LIBDEFLATE_BUILD_STATIC_LIB)
>+ endif()
>+ 
>+ # Set common C compiler flags for all targets (the library and the programs).
>+-set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
>++#set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
>+ set(CMAKE_C_STANDARD 99)
>+ if(NOT MSVC)
>+     check_c_compiler_flag(-Wdeclaration-after-statement HAVE_WDECLARATION_AFTER_STATEMENT)
>diff --git a/archivers/libdeflate/files/patch-Makefile b/archivers/libdeflate/files/patch-Makefile
>deleted file mode 100644
>index 66a8a1f66d06..000000000000
>--- a/archivers/libdeflate/files/patch-Makefile
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- Makefile.orig	2022-09-11 02:13:50 UTC
>-+++ Makefile
>-@@ -54,7 +54,7 @@ override CFLAGS :=							\
>- 	      1>&2 2>/dev/null; then echo $(1); fi)
>- 
>- override CFLAGS :=							\
>--	-O2 -fomit-frame-pointer -std=c99 -I. -Wall -Wundef		\
>-+	-std=c99 -I. -Wall -Wundef					\
>- 	$(call cc-option,-Wdeclaration-after-statement)			\
>- 	$(call cc-option,-Wimplicit-fallthrough)			\
>- 	$(call cc-option,-Wmissing-prototypes)				\
>-@@ -340,7 +340,7 @@ install:all $(PKGCONFBASE)
>- 		$(DESTDIR)$(BINDIR)
>- 	install -m644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
>- 	if [ -z "$(DISABLE_SHARED)" ]; then				\
>--		install -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR);	\
>-+		install -s -m755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR);	\
>- 	fi
>- 	sed -e "s|@PREFIX@|$(PREFIX)|"					\
>- 	    -e "s|@LIBDIR@|$(LIBDIR)|"					\
>-@@ -349,7 +349,7 @@ install:all $(PKGCONFBASE)
>- 	    $(PKGCONFBASE) > $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
>- 	chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/libdeflate.pc
>- 	install -m644 libdeflate.h $(DESTDIR)$(INCDIR)
>--	install -m755 gzip$(PROG_SUFFIX) \
>-+	install -s -m755 gzip$(PROG_SUFFIX) \
>- 		$(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX)
>- 	if [ -n "$(HARD_LINKS)" ]; then					\
>- 		ln -f $(DESTDIR)$(BINDIR)/libdeflate-gzip$(PROG_SUFFIX)	\
>diff --git a/archivers/libdeflate/pkg-plist b/archivers/libdeflate/pkg-plist
>new file mode 100644
>index 000000000000..a578206b2cfd
>--- /dev/null
>+++ b/archivers/libdeflate/pkg-plist
>@@ -0,0 +1,11 @@
>+bin/libdeflate-gunzip
>+bin/libdeflate-gzip
>+include/libdeflate.h
>+lib/cmake/libdeflate/libdeflate-config-version.cmake
>+lib/cmake/libdeflate/libdeflate-config.cmake
>+lib/cmake/libdeflate/libdeflate-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/libdeflate/libdeflate-targets.cmake
>+lib/libdeflate.a
>+lib/libdeflate.so
>+lib/libdeflate.so.0
>+libdata/pkgconfig/libdeflate.pc

Actions: View | Diff

Attachments on bug 268519: 238980