From f43099ca2f10e976e1ba7044e989f3b02e921bb6 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 18 Dec 2020 11:27:18 +0100 Subject: [PATCH] zstd: update to 1.4.7. --- srcpkgs/zstd/patches/32bit.diff | 26 ++++++++++++++++++++++++++ srcpkgs/zstd/template | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/zstd/patches/32bit.diff diff --git a/srcpkgs/zstd/patches/32bit.diff b/srcpkgs/zstd/patches/32bit.diff new file mode 100644 index 00000000000..797aa254fae --- /dev/null +++ b/srcpkgs/zstd/patches/32bit.diff @@ -0,0 +1,26 @@ +--- lib/common/fse.h ++++ lib/common/fse.h +@@ -335,9 +335,10 @@ size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue); + + /* FSE_buildCTable_wksp() : + * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`). +- * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog)`. ++ * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)` of `unsigned`. + */ +-#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * (maxSymbolValue + 2) + (1ull << tableLog)) ++#define FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog) (maxSymbolValue + 2 + (1ull << (tableLog - 2))) ++#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)) + size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize); + + #define FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) (sizeof(short) * (maxSymbolValue + 1) + (1ULL << maxTableLog) + 8) +--- lib/compress/huf_compress.c ++++ lib/compress/huf_compress.c +@@ -69,7 +69,7 @@ static size_t HUF_compressWeights (void* dst, size_t dstSize, const void* weight + U32 tableLog = MAX_FSE_TABLELOG_FOR_HUFF_HEADER; + + FSE_CTable CTable[FSE_CTABLE_SIZE_U32(MAX_FSE_TABLELOG_FOR_HUFF_HEADER, HUF_TABLELOG_MAX)]; +- BYTE scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)]; ++ U32 scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)]; + + unsigned count[HUF_TABLELOG_MAX+1]; + S16 norm[HUF_TABLELOG_MAX+1]; diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template index 39ec890a2ee..28ce7b9caaf 100644 --- a/srcpkgs/zstd/template +++ b/srcpkgs/zstd/template @@ -1,6 +1,6 @@ # Template file for 'zstd' pkgname=zstd -version=1.4.5 +version=1.4.7 revision=1 bootstrap=yes makedepends="zlib-devel liblzma-devel liblz4-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="BSD-3-Clause, GPL-2.0-or-later" homepage="http://www.zstd.net" distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz" -checksum=734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2 +checksum=085500c8d0b9c83afbc1dc0d8b4889336ad019eba930c5d6a9c6c86c20c769c8 do_build() { make ${makejobs}