From 9a079fab418b9f4f9f5ca655d28aae2e2a0032ba Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 30 Apr 2019 09:17:38 +0000 Subject: lz4: updated to 1.9.1 LZ4 v1.9.1 Changes fix : decompression functions were reading a few bytes beyond input size api : fix : lz4frame initializers compatibility with c++ cli : added command --list build: improved Windows build build: AIX, by Norman Green LZ4 v1.9.0 This release brings an assortment of small improvements and bug fixes, as detailed below : perf: large decompression speed improvement on x86/x64 (up to +20%) api : changed : _destSize() compression variants are promoted to stable API api : new : LZ4_initStream(HC), replacing LZ4_resetStream(HC) api : changed : LZ4_resetStream(HC) as recommended reset function, for better performance on small data cli : support custom block sizes build: source code can be amalgamated, by Bing Xu build: added meson build build: new build macros : LZ4_DISTANCE_MAX, LZ4_FAST_DEC_LOOP install: MidnightBSD install: msys2 on Windows 10 --- archivers/lz4/Makefile | 4 +- archivers/lz4/distinfo | 16 ++++---- archivers/lz4/patches/patch-Makefile | 22 ----------- archivers/lz4/patches/patch-Makefile.inc | 18 +++++++++ archivers/lz4/patches/patch-lib_Makefile | 57 +++++++++++++-------------- archivers/lz4/patches/patch-programs_Makefile | 38 +++++------------- 6 files changed, 65 insertions(+), 90 deletions(-) delete mode 100644 archivers/lz4/patches/patch-Makefile create mode 100644 archivers/lz4/patches/patch-Makefile.inc (limited to 'archivers') diff --git a/archivers/lz4/Makefile b/archivers/lz4/Makefile index 03f42430ca9..fac5c2b60d5 100644 --- a/archivers/lz4/Makefile +++ b/archivers/lz4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2018/12/15 21:12:18 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/04/30 09:17:38 adam Exp $ -DISTNAME= lz4-1.8.3 +DISTNAME= lz4-1.9.1 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GITHUB:=lz4/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo index 8a2d053af73..6d4fc7653bf 100644 --- a/archivers/lz4/distinfo +++ b/archivers/lz4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2018/09/14 09:48:56 fhajny Exp $ +$NetBSD: distinfo,v 1.17 2019/04/30 09:17:38 adam Exp $ -SHA1 (lz4-1.8.3.tar.gz) = 070867abcd93a7245b80ec6fc2ced27c6b8e3e0c -RMD160 (lz4-1.8.3.tar.gz) = b3c36093fe317942eb02b4a944e3bfe37598a2d1 -SHA512 (lz4-1.8.3.tar.gz) = 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f -Size (lz4-1.8.3.tar.gz) = 327897 bytes -SHA1 (patch-Makefile) = b244760f8fa20813b8c830819bd363de7d9d3159 -SHA1 (patch-lib_Makefile) = 798a624cd51b93b31a07d5afe538940d618db845 -SHA1 (patch-programs_Makefile) = 517ddd16056faefaddcbbced0aa00cad7530890a +SHA1 (lz4-1.9.1.tar.gz) = 70cf7b4ac726b6afd54c2e151aa4a7815279966a +RMD160 (lz4-1.9.1.tar.gz) = 9e10812cf2862ef2db70678f054128f30e20051d +SHA512 (lz4-1.9.1.tar.gz) = 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e +Size (lz4-1.9.1.tar.gz) = 285336 bytes +SHA1 (patch-Makefile.inc) = 55d576430ed1a160709a56e104edc14cad88e5a9 +SHA1 (patch-lib_Makefile) = 8eda2146522bd2d5e418916fd99fb201810cb36d +SHA1 (patch-programs_Makefile) = 671728182325f03164eb898d9d846fd2aa4353f7 diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile deleted file mode 100644 index d205ba8c380..00000000000 --- a/archivers/lz4/patches/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-Makefile,v 1.8 2018/09/14 09:48:56 fhajny Exp $ - -Unlock install target. - ---- Makefile.orig 2018-09-11 19:52:06.000000000 +0000 -+++ Makefile -@@ -89,7 +89,6 @@ clean: - #----------------------------------------------------------------------------- - # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) - HOST_OS = POSIX - - .PHONY: install uninstall -@@ -103,7 +102,6 @@ travis-install: - cmake: - @cd contrib/cmake_unofficial; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE) - --endif - - - ifneq (,$(filter MSYS%,$(shell uname))) diff --git a/archivers/lz4/patches/patch-Makefile.inc b/archivers/lz4/patches/patch-Makefile.inc new file mode 100644 index 00000000000..7427f95ab91 --- /dev/null +++ b/archivers/lz4/patches/patch-Makefile.inc @@ -0,0 +1,18 @@ +$NetBSD: patch-Makefile.inc,v 1.1 2019/04/30 09:17:38 adam Exp $ + +Unlock install target. + +--- Makefile.inc.orig 2019-04-30 08:08:05.000000000 +0000 ++++ Makefile.inc +@@ -51,11 +51,7 @@ VOID := /dev/null + endif + endif + +-ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW% CYGWIN% MSYS%,$(shell uname))) + POSIX_ENV = Yes +-else +-POSIX_ENV = No +-endif + + # Avoid symlinks when targetting Windows or building on a Windows host + ifeq ($(WINBASED),yes) diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile index 8673c33a5ff..437710c1e6d 100644 --- a/archivers/lz4/patches/patch-lib_Makefile +++ b/archivers/lz4/patches/patch-lib_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_Makefile,v 1.9 2018/09/14 09:48:56 fhajny Exp $ +$NetBSD: patch-lib_Makefile,v 1.10 2019/04/30 09:17:38 adam Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. ---- lib/Makefile.orig 2018-09-11 19:52:06.000000000 +0000 +--- lib/Makefile.orig 2019-04-23 17:18:40.000000000 +0000 +++ lib/Makefile @@ -33,9 +33,9 @@ # ################################################################ @@ -17,30 +17,26 @@ Make portable. Unlock install target. Use pkgsrc install scripts. LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) -@@ -124,7 +124,6 @@ clean: - #----------------------------------------------------------------------------- - # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets - #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) +@@ -45,6 +45,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT) + BUILD_SHARED:=yes + BUILD_STATIC:=yes - .PHONY: listL120 - listL120: # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility) -@@ -143,12 +142,7 @@ libdir ?= $(LIBDIR) ++OS ?= $(shell uname) + CPPFLAGS+= -DXXH_NAMESPACE=LZ4_ + CFLAGS ?= -O3 + DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ +@@ -156,28 +157,23 @@ libdir ?= $(LIBDIR) INCLUDEDIR ?= $(prefix)/include includedir ?= $(INCLUDEDIR) --ifneq (,$(filter $(OS),OpenBSD FreeBSD NetBSD DragonFly)) +- ifneq (,$(filter $(TARGET_OS),OpenBSD FreeBSD NetBSD DragonFly MidnightBSD)) -PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig --else +- else -PKGCONFIGDIR ?= $(libdir)/pkgconfig --endif +- endif -pkgconfigdir ?= $(PKGCONFIGDIR) +pkgconfigdir ?= $(prefix)/lib/pkgconfig - ifneq (,$(filter $(OS),SunOS)) - INSTALL ?= ginstall -@@ -161,29 +155,29 @@ INSTALL_DATA ?= $(INSTALL) -m 644 - liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig - $(Q)sed -e 's|@PREFIX@|$(prefix)|' \ @@ -54,23 +50,29 @@ Make portable. Unlock install target. Use pkgsrc install scripts. $< >$@ install: lib liblz4.pc -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ +- $(Q)$(INSTALL_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/ - $(Q)$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/ -+ $(Q)$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ ++ $(Q)$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/ + $(Q)$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/ @echo Installing libraries - ifeq ($(BUILD_STATIC),yes) + ifeq ($(BUILD_STATIC),yes) - $(Q)$(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a - $(Q)$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h + $(Q)$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a + $(Q)$(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h - endif - ifeq ($(BUILD_SHARED),yes) + endif + ifeq ($(BUILD_SHARED),yes) + # Traditionnally, one installs the DLLs in the bin directory as programs +@@ -187,15 +183,15 @@ install: lib liblz4.pc + $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir) + $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir) + else - $(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir) + $(Q)$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir) - $(Q)ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR) - $(Q)ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT) - endif + $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR) + $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT) + endif + endif @echo Installing headers in $(includedir) - $(Q)$(INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h - $(Q)$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h @@ -81,8 +83,3 @@ Make portable. Unlock install target. Use pkgsrc install scripts. @echo lz4 libraries installed uninstall: -@@ -198,4 +192,3 @@ uninstall: - $(Q)$(RM) $(DESTDIR)$(includedir)/lz4frame_static.h - @echo lz4 libraries successfully uninstalled - --endif diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile index 21a92c4826a..ced37e86bb9 100644 --- a/archivers/lz4/patches/patch-programs_Makefile +++ b/archivers/lz4/patches/patch-programs_Makefile @@ -1,22 +1,10 @@ -$NetBSD: patch-programs_Makefile,v 1.11 2018/09/14 09:48:56 fhajny Exp $ +$NetBSD: patch-programs_Makefile,v 1.12 2019/04/30 09:17:39 adam Exp $ Unlock install target. Use pkgsrc install scripts. ---- programs/Makefile.orig 2018-09-11 19:52:06.000000000 +0000 +--- programs/Makefile.orig 2019-04-23 17:18:40.000000000 +0000 +++ programs/Makefile -@@ -106,11 +106,6 @@ clean: - @echo Cleaning completed - - --#----------------------------------------------------------------------------- --# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets --#----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) -- - unlz4: lz4 - ln -s lz4$(EXT) unlz4$(EXT) - -@@ -129,7 +124,7 @@ BINDIR ?= $(exec_prefix)/bin +@@ -140,20 +140,20 @@ BINDIR ?= $(exec_prefix)/bin bindir ?= $(BINDIR) DATAROOTDIR ?= $(prefix)/share datarootdir ?= $(DATAROOTDIR) @@ -25,25 +13,19 @@ Unlock install target. Use pkgsrc install scripts. mandir ?= $(MANDIR) MAN1DIR ?= $(mandir)/man1 man1dir ?= $(MAN1DIR) -@@ -146,13 +141,13 @@ INSTALL_DATA ?= $(INSTALL) -m 644 install: lz4 @echo Installing binaries -- @$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/ +- @$(INSTALL_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/ - @$(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT) + @$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/ + @$(BSD_INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT) - @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT) - @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT) - @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT) + @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT) + @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT) + @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT) @echo Installing man pages - @$(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1 + @$(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(man1dir)/lz4.1 - @ln -sf lz4.1 $(DESTDIR)$(man1dir)/lz4c.1 - @ln -sf lz4.1 $(DESTDIR)$(man1dir)/lz4cat.1 - @ln -sf lz4.1 $(DESTDIR)$(man1dir)/unlz4.1 -@@ -169,4 +164,3 @@ uninstall: - @$(RM) $(DESTDIR)$(man1dir)/unlz4.1 - @echo lz4 programs successfully uninstalled - --endif + @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4c.1 + @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4cat.1 + @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/unlz4.1 -- cgit v1.2.3