From: Yann Collet Date: Wed, 2 Nov 2016 00:26:22 +0000 (-0700) Subject: moved cmake and debian directories to contrib (#245) X-Git-Tag: upstream/1.9.3~120 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f17302769055ad0c4b2e10e3de544f6593865e89;p=platform%2Fupstream%2Flz4.git moved cmake and debian directories to contrib (#245) --- diff --git a/Makefile b/Makefile index 930922d..518ffbd 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ test: $(MAKE) -C $(PRGDIR) test cmake: - @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE) + @cd contrib/cmake_unofficial; cmake CMakeLists.txt; $(MAKE) gpptest: clean $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror" diff --git a/NEWS b/NEWS index a1baead..b676d86 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,10 @@ -r132 +v1.7.2 +Changed : moved to versioning; package, cli and library have same version number Improved: Small decompression speed boost (+4%) Improved: Performance on ARMv6 and ARMv7 Added : Debianization, by Evgeniy Polyakov -Makefile: Safely protects lz4 version when selecting custom CFLAGS -Makefile: Generates intermediate object files (*.o) for faster compilation on low power systems +Makefile: Generates object files (*.o) for faster (re)compilation on low power systems +Fix : cli : crash on some invalid inputs r131 New : Dos/DJGPP target, thanks to Louis Santillan (#114) diff --git a/contrib/cmake_unofficial/.gitignore b/contrib/cmake_unofficial/.gitignore new file mode 100644 index 0000000..0f81929 --- /dev/null +++ b/contrib/cmake_unofficial/.gitignore @@ -0,0 +1,7 @@ +# cmake artefact + +CMakeCache.txt +CMakeFiles +*.cmake +Makefile +liblz4.pc diff --git a/cmake_unofficial/CMakeLists.txt b/contrib/cmake_unofficial/CMakeLists.txt similarity index 97% rename from cmake_unofficial/CMakeLists.txt rename to contrib/cmake_unofficial/CMakeLists.txt index c7f1dab..6edec98 100644 --- a/cmake_unofficial/CMakeLists.txt +++ b/contrib/cmake_unofficial/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(LZ4 C) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LZ4 compression library") set(CPACK_PACKAGE_VERSION_MAJOR 1) set(CPACK_PACKAGE_VERSION_MINOR 7) -set(CPACK_PACKAGE_VERSION_PATCH r132) +set(CPACK_PACKAGE_VERSION_PATCH 2) set(VERSION_STRING " \"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\" ") include(CPack) @@ -24,8 +24,8 @@ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR ENDIF() -set(LZ4_DIR ../lib/) -set(PRG_DIR ../programs/) +set(LZ4_DIR ../../lib/) +set(PRG_DIR ../../programs/) set(LZ4_SRCS_LIB ${LZ4_DIR}lz4.c ${LZ4_DIR}lz4hc.c ${LZ4_DIR}lz4.h ${LZ4_DIR}lz4hc.h ${LZ4_DIR}lz4frame.c ${LZ4_DIR}lz4frame.h ${LZ4_DIR}xxhash.c) set(LZ4_SRCS ${LZ4_DIR}lz4frame.c ${LZ4_DIR}xxhash.c ${PRG_DIR}bench.c ${PRG_DIR}lz4cli.c ${PRG_DIR}lz4io.c) @@ -108,7 +108,3 @@ if(GNU_COMPATIBLE_COMPILER) endif() ADD_DEFINITIONS("-DLZ4_VERSION=\"${CPACK_PACKAGE_VERSION_PATCH}\"") INCLUDE_DIRECTORIES (${LZ4_DIR}) - - - - diff --git a/contrib/debian/changelog b/contrib/debian/changelog new file mode 100644 index 0000000..87ac016 --- /dev/null +++ b/contrib/debian/changelog @@ -0,0 +1,10 @@ +liblz4 (1.7.2) unstable; urgency=low + + * Changed : moved to versioning; package, cli and library have same version number + * Improved: Small decompression speed boost (+4%) + * Improved: Performance on ARMv6 and ARMv7 + * Added : Debianization, by Evgeniy Polyakov + * Makefile: Generates object files (*.o) for faster (re)compilation on low power systems + * Fix : cli : crash on some invalid inputs + + -- Yann Collet Sun, 28 Jun 2015 01:00:00 +0000 diff --git a/debian/compat b/contrib/debian/compat similarity index 100% rename from debian/compat rename to contrib/debian/compat diff --git a/debian/control b/contrib/debian/control similarity index 79% rename from debian/control rename to contrib/debian/control index 1a5a077..ac3b460 100644 --- a/debian/control +++ b/contrib/debian/control @@ -7,9 +7,9 @@ Build-Depends: debhelper (>= 7.0.50~), cdbs Standards-Version: 3.8.0 -Homepage: https://code.google.com/p/lz4/ -Vcs-Git: git://github.com/Cyan4973/lz4.git -Vcs-Browser: https://github.com/Cyan4973/lz4 +Homepage: http://www.lz4.org/ +Vcs-Git: git://github.com/lz4/lz4.git +Vcs-Browser: https://github.com/lz4/lz4 Package: liblz4 Architecture: any diff --git a/debian/copyright b/contrib/debian/copyright similarity index 87% rename from debian/copyright rename to contrib/debian/copyright index da22555..18a7f48 100644 --- a/debian/copyright +++ b/contrib/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: liblz4 Upstream-Contact: Yann Collet -Source: https://github.com/Cyan4973/lz4 +Source: https://github.com/lz4/lz4 Files: * Copyright: (C) 2011+ Yann Collet diff --git a/debian/dirs b/contrib/debian/dirs similarity index 100% rename from debian/dirs rename to contrib/debian/dirs diff --git a/debian/docs b/contrib/debian/docs similarity index 100% rename from debian/docs rename to contrib/debian/docs diff --git a/debian/liblz4-dev.install b/contrib/debian/liblz4-dev.install similarity index 100% rename from debian/liblz4-dev.install rename to contrib/debian/liblz4-dev.install diff --git a/debian/liblz4.install b/contrib/debian/liblz4.install similarity index 100% rename from debian/liblz4.install rename to contrib/debian/liblz4.install diff --git a/debian/rules b/contrib/debian/rules similarity index 100% rename from debian/rules rename to contrib/debian/rules diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 7a4bac6..0000000 --- a/debian/changelog +++ /dev/null @@ -1,8 +0,0 @@ -liblz4 (0.131) unstable; urgency=low - - * New : Dos/DJGPP target, thanks to Louis Santillan (#114) - * Added : Example using lz4frame library, by Zbigniew Jędrzejewski-Szmek (#118) - * Changed: xxhash symbols are modified (namespace emulation) within liblz4 - - -- Yann Collet Sun, 28 Jun 2015 01:00:00 +0000 - diff --git a/programs/lz4io.c b/programs/lz4io.c index 7293d77..f90cb50 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -697,12 +697,12 @@ static unsigned long long LZ4IO_decodeLegacyStream(FILE* finput, FILE* foutput) /* Main Loop */ while (1) { int decodeSize; - size_t sizeCheck; unsigned int blockSize; /* Block Size */ - sizeCheck = fread(in_buff, 1, 4, finput); - if (sizeCheck==0) break; /* Nothing to read : file read is completed */ + { size_t const sizeCheck = fread(in_buff, 1, 4, finput); + if (sizeCheck == 0) break; /* Nothing to read : file read is completed */ + if (sizeCheck != 4) EXM_THROW(52, "Read error : cannot access block size "); } blockSize = LZ4IO_readLE32(in_buff); /* Convert to Little Endian */ if (blockSize > LZ4_COMPRESSBOUND(LEGACY_BLOCKSIZE)) { /* Cannot read next block : maybe new stream ? */ @@ -711,8 +711,8 @@ static unsigned long long LZ4IO_decodeLegacyStream(FILE* finput, FILE* foutput) } /* Read Block */ - sizeCheck = fread(in_buff, 1, blockSize, finput); - if (sizeCheck!=blockSize) EXM_THROW(52, "Read error : cannot access compressed block !"); + { size_t const sizeCheck = fread(in_buff, 1, blockSize, finput); + if (sizeCheck!=blockSize) EXM_THROW(52, "Read error : cannot access compressed block !"); } /* Decode Block */ decodeSize = LZ4_decompress_safe(in_buff, out_buff, blockSize, LEGACY_BLOCKSIZE);