Accepting request 508431 from Archiving
- Update to new upstrema release 1.7.5 (2017-01-03) OBS-URL: https://build.opensuse.org/request/show/508431 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lz4?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fbee2c7d65
@ -1 +1 @@
|
||||
liblz4-1_7
|
||||
liblz4-1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de
|
||||
Date: 2014-10-01 14:23:22.000000000 +0200
|
||||
|
||||
build: stop causing rebuilds on our side
|
||||
|
||||
---
|
||||
programs/fullbench.c | 2 +-
|
||||
programs/lz4cli.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: lz4-r131/programs/fullbench.c
|
||||
===================================================================
|
||||
--- lz4-r131.orig/programs/fullbench.c
|
||||
+++ lz4-r131/programs/fullbench.c
|
||||
@@ -103,7 +103,7 @@
|
||||
# define LZ4_VERSION ""
|
||||
#endif
|
||||
#define AUTHOR "Yann Collet"
|
||||
-#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, LZ4_VERSION, (int)(sizeof(void*)*8), AUTHOR, __DATE__
|
||||
+#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, LZ4_VERSION, (int)(sizeof(void*)*8), AUTHOR, "SUSE"
|
||||
|
||||
#define NBLOOPS 6
|
||||
#define TIMELOOP 2500
|
||||
Index: lz4-r131/programs/lz4cli.c
|
||||
===================================================================
|
||||
--- 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 LZ4CAT "lz4cat"
|
||||
#define UNLZ4 "unlz4"
|
||||
@ -1,32 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2014-11-28 20:01:01.723860722 +0100
|
||||
References: https://github.com/Cyan4973/lz4/pull/195
|
||||
|
||||
lz4 repeatedly changed the ABI without updating the SONAME
|
||||
in r124 (size of LZ4_streamDecode_t changes)
|
||||
---
|
||||
lib/Makefile | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: lz4-r131/lib/Makefile
|
||||
===================================================================
|
||||
--- 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).$(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)
|
||||
SHARED_EXT = so
|
||||
- SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
|
||||
+ SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR)
|
||||
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
|
||||
endif
|
||||
|
||||
@ -5,62 +5,43 @@ References: https://github.com/Cyan4973/lz4/pull/195
|
||||
build: make programs use liblz too instead of duplicating object code.
|
||||
|
||||
---
|
||||
programs/Makefile | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
programs/Makefile | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: lz4-r131/programs/Makefile
|
||||
Index: lz4-1.7.5/programs/Makefile
|
||||
===================================================================
|
||||
--- 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)
|
||||
--- lz4-1.7.5.orig/programs/Makefile
|
||||
+++ lz4-1.7.5/programs/Makefile
|
||||
@@ -40,7 +40,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT)
|
||||
|
||||
BINDIR := $(PREFIX)/bin
|
||||
MANDIR := $(PREFIX)/share/man/man1
|
||||
@@ -72,32 +72,32 @@ bins: lz4 lz4c fullbench fuzzer frametes
|
||||
LZ4DIR := ../lib
|
||||
|
||||
all: bins m32
|
||||
-SRCFILES := $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c)
|
||||
+SRCFILES := $(wildcard *.c)
|
||||
OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
|
||||
|
||||
-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
|
||||
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
||||
+lz4: bench.c lz4io.c lz4cli.c
|
||||
+ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4
|
||||
CPPFLAGS+= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_
|
||||
@@ -75,19 +75,19 @@ all32: CFLAGS+=-m32
|
||||
all32: all
|
||||
|
||||
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
|
||||
lz4: CFLAGS += $(DEBUGFLAGS)
|
||||
-lz4: $(OBJFILES)
|
||||
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
||||
+lz4: $(SRCFILES)
|
||||
+ $(CC) $(FLAGS) $^ -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
|
||||
lz4-release: DEBUGFLAGS=
|
||||
lz4-release: lz4
|
||||
|
||||
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
|
||||
lz4c : CFLAGS += $(DEBUGFLAGS)
|
||||
lz4c : $(SRCFILES)
|
||||
- $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
|
||||
+ $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -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
|
||||
lz4c32: CFLAGS += -m32 $(DEBUGFLAGS)
|
||||
lz4c32: $(SRCFILES)
|
||||
- $(CC) $(FLAGS) $^ -o $@$(EXT)
|
||||
+ $(CC) $(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)
|
||||
clean:
|
||||
@$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 5 22:51:53 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Update to new upstrema release 1.7.5 (2017-01-03)
|
||||
* back to the old version scheme
|
||||
* lz4hc: new compression levels 10-12
|
||||
- Remove lz4-soversion.diff (not needed),
|
||||
lz4-killdate.diff (no longer needed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 07:57:03 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
|
||||
14
lz4.spec
14
lz4.spec
@ -17,8 +17,8 @@
|
||||
|
||||
|
||||
Name: lz4
|
||||
%define lname liblz4-1_7
|
||||
Version: 131
|
||||
%define lname liblz4-1
|
||||
Version: 1.7.5
|
||||
Release: 0
|
||||
Summary: Hash-based Predictive Lempel–Ziv compressor
|
||||
License: GPL-2.0+ and BSD-2-Clause
|
||||
@ -26,11 +26,9 @@ Group: Productivity/Archiving/Compression
|
||||
Url: http://lz4.org/
|
||||
|
||||
#Git-Clone: https://github.com/Cyan4973/lz4
|
||||
Source: https://github.com/Cyan4973/lz4/archive/r%version.tar.gz
|
||||
Source: https://github.com/Cyan4973/lz4/archive/v%version.tar.gz
|
||||
Source99: baselibs.conf
|
||||
Patch1: lz4-soversion.diff
|
||||
Patch2: lz4-use-shlib.diff
|
||||
Patch3: lz4-killdate.diff
|
||||
Patch1: lz4-use-shlib.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: pkg-config
|
||||
|
||||
@ -70,8 +68,8 @@ This subpackage contains libraries and header files for developing
|
||||
applications that want to make use of liblz4.
|
||||
|
||||
%prep
|
||||
%setup -qn %name-r%version
|
||||
%patch -P 1 -P 2 -P 3 -p1
|
||||
%setup -q
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
# Goddammit, lz4
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed
|
||||
size 133784
|
||||
3
v1.7.5.tar.gz
Normal file
3
v1.7.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
|
||||
size 208019
|
||||
Loading…
Reference in New Issue
Block a user