jengelh/lz4
SHA256
1
0
Fork 0
forked from pool/lz4
Code Pull Requests Activity

Accepting request 383424 from Archiving

Browse Source 
- Update to new upstream release 131 (library 1.7) (boo#973735)
* slightly improved decoding speed
* lz4frame API is included in liblz4
* new -m command line option to compress multiple files
* new lz4 and lz4hc compression API (old one retained)

OBS-URL: https://build.opensuse.org/request/show/383424
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lz4?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2016-04-07 11:35:47 +00:00 committed by Git OBS Bridge
commit ee3f9fe8a2
7 changed files with 122 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lz4-1.4.0+svn124.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0d2e1565a52b2c6e87005032f4523da8229ab56c595951e2b263dd7f99d8c6f
size 114636

22
lz4-killdate.diff
View File

@ -8,11 +8,11 @@ build: stop causing rebuilds on our side
programs/lz4cli.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: trunk/programs/fullbench.c
Index: lz4-r131/programs/fullbench.c
===================================================================
--- trunk.orig/programs/fullbench.c
+++ trunk/programs/fullbench.c
@@ -107,7 +107,7 @@
--- lz4-r131.orig/programs/fullbench.c
+++ lz4-r131/programs/fullbench.c
@@ -103,7 +103,7 @@
# define LZ4_VERSION ""
#endif
#define AUTHOR "Yann Collet"
@ -21,16 +21,16 @@ Index: trunk/programs/fullbench.c
#define NBLOOPS 6
#define TIMELOOP 2500
Index: trunk/programs/lz4cli.c
Index: lz4-r131/programs/lz4cli.c
===================================================================
--- trunk.orig/programs/lz4cli.c
+++ trunk/programs/lz4cli.c
@@ -116,7 +116,7 @@
# define LZ4_VERSION "r122"
--- lz4-r131.orig/programs/lz4cli.c
+++ lz4-r131/programs/lz4cli.c
@@ -90,7 +90,7 @@
# define LZ4_VERSION "r128"
#endif
#define AUTHOR "Yann Collet"
-#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__
+#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, "SUSE"
#define LZ4_EXTENSION ".lz4"
#define LZ4_CAT "lz4cat"
#define LZ4CAT "lz4cat"
#define UNLZ4 "unlz4"

25
lz4-soversion.diff
View File

@ -1,19 +1,26 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-11-28 20:01:01.723860722 +0100
References: https://github.com/Cyan4973/lz4/pull/195
lz4 management apparently changed the ABI in r124 (size of
LZ4_streamDecode_t changes) and did not update SO versioning.
lz4 repeatedly changed the ABI without updating the SONAME
in r124 (size of LZ4_streamDecode_t changes)
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
lib/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: trunk/Makefile
Index: lz4-r131/lib/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin)
--- lz4-r131.orig/lib/Makefile
+++ lz4-r131/lib/Makefile
@@ -50,13 +50,13 @@ INCLUDEDIR=$(PREFIX)/include
# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
ifeq ($(shell uname), Darwin)
SHARED_EXT = dylib
- SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
+ SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(SHARED_EXT)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
- SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
+ SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR).$(LIBVER_MINOR) -current_version $(LIBVER)
else
- SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
+ SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR)

70
lz4-use-shlib.diff
View File

@ -1,30 +1,66 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-10-01 14:23:22.000000000 +0200
References: https://github.com/Cyan4973/lz4/pull/195
build: make programs use liblz too instead of linking it statically
build: make programs use liblz too instead of duplicating object code.
Stop wasting my disk space!
---
programs/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
programs/Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
Index: trunk/programs/Makefile
Index: lz4-r131/programs/Makefile
===================================================================
--- trunk.orig/programs/Makefile
+++ trunk/programs/Makefile
@@ -65,11 +65,11 @@ default: lz4 lz4c
--- lz4-r131.orig/programs/Makefile
+++ lz4-r131/programs/Makefile
@@ -40,7 +40,7 @@ DESTDIR?=
PREFIX ?= /usr/local
CFLAGS ?= -O3
CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
-FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS := -DXXH_NAMESPACE=LZ4_ -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen
BINDIR := $(PREFIX)/bin
MANDIR := $(PREFIX)/share/man/man1
@@ -72,32 +72,32 @@ bins: lz4 lz4c fullbench fuzzer frametes
-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+lz4: $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
+ $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
all: bins m32
-lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
+lz4c : $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
+lz4: bench.c lz4io.c lz4cli.c
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
$(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+ $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+ $(CC) -m32 $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4
fullbench : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
fullbench32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c fullbench.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
fuzzer : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
fuzzer32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c fuzzer.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
frametest: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
frametest32: $(LZ4DIR)/lz4frame.c $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c frametest.c
- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
+ $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
datagen : datagen.c datagencli.c
$(CC) $(FLAGS) $^ -o $@$(EXT)

9
lz4.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Apr 2 19:26:32 UTC 2016 - jengelh@inai.de
- Update to new upstream release 131 (library 1.7) (boo#973735)
* slightly improved decoding speed
* lz4frame API is included in liblz4
* new -m command line option to compress multiple files
* new lz4 and lz4hc compression API (old one retained)
-------------------------------------------------------------------
Fri Nov 28 19:02:06 UTC 2014 - jengelh@inai.de

55
lz4.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lz4
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,29 +17,27 @@
Name: lz4
%define lname liblz4-1_4
Version: 1.4.0+svn124
%define lname liblz4-1_7
Version: 131
Release: 0
Summary: Hash-based Predictive Lempel-Ziv compressor
Summary: Hash-based Predictive Lempel–Ziv compressor
License: GPL-2.0+ and BSD-2-Clause
Group: Productivity/Archiving/Compression
Url: http://code.google.com/p/lz4/
#URL: http://fastcompression.blogspot.com/p/lz4.html
Url: http://lz4.org/
#SVN-Clone: http://lz4.googlecode.com/svn/trunk
# Project offers no source tarballs.
Source: %name-%version.tar.xz
Patch1: lz4-use-shlib.diff
Patch2: lz4-killdate.diff
Patch3: lz4-soversion.diff
#Git-Clone: https://github.com/Cyan4973/lz4
Source: https://github.com/Cyan4973/lz4/archive/r%version.tar.gz
Patch1: lz4-soversion.diff
Patch2: lz4-use-shlib.diff
Patch3: lz4-killdate.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkg-config
BuildRequires: xz
%description
LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv)
algorithm. It is a LZP2 fork and provides better compression ratio
for text files.
LZ4 is a lossless data compression algorithm that is focused on
compression and decompression speed. It belongs to the LZ77
(Lempel–Ziv) family of byte-oriented compression schemes. It is a
LZP2 fork and provides better compression ratio for text files.
This subpackage provides a GPL command-line utility to make use of
the LZ4 algorithm.
@ -50,9 +48,9 @@ License: BSD-2-Clause
Group: System/Libraries
%description -n %lname
LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv)
algorithm. It is a LZP2 fork and provides better compression ratio
for text files.
LZ4 is a lossless data compression algorithm that is focused on
compression and decompression speed. It belongs to the LZ77
(Lempel–Ziv) family of byte-oriented compression schemes. It is a
This subpackage contains the (de)compressor code as a shared library.
@ -63,30 +61,37 @@ Group: Development/Libraries/C and C++
Requires: %lname = %version
%description -n liblz4-devel
LZ4 is a very fast compressor, based on well-known LZ77 (Lempel-Ziv)
algorithm. It is a LZP2 fork and provides better compression ratio
for text files.
LZ4 is a lossless data compression algorithm that is focused on
compression and decompression speed. It belongs to the LZ77
(Lempel–Ziv) family of byte-oriented compression schemes. It is a
This subpackage contains libraries and header files for developing
applications that want to make use of liblz4.
%prep
%setup -qn trunk
%setup -qn %name-r%version
%patch -P 1 -P 2 -P 3 -p1
%build
make %{?_smp_mflags} CFLAGS="%optflags"
# Goddammit, lz4
perl -i -pe 's{^\t@}{\t}g' Makefile */Makefile
# don't bother building here, because make install builds it again - unconditionally :-(
%install
make install DESTDIR="%buildroot" LIBDIR="%_libdir"
make install CFLAGS="%optflags -DXXH_NAMESPACE=LZ4_" \
DESTDIR="%buildroot" PREFIX="%_prefix" LIBDIR="%_libdir"
rm -f "%buildroot/%_libdir"/*.a
%check
LD_LIBRARY_PATH="%buildroot/%_libdir" ldd -r "%buildroot/%_bindir/lz4"
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%defattr(-,root,root)
%_bindir/lz4*
%_bindir/unlz4
%_mandir/man1/*.1*
%files -n %lname

3
r131.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed
size 133784