From: 4ricci <4ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zstd: update to 1.4.7.
Date: Fri, 18 Dec 2020 17:37:34 +0100 [thread overview]
Message-ID: <20201218163734.QfNysRTufrBYesheg3v52q4k1QLJAZ700IeyZct5IyE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27253@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages zstd-1.4.7
https://github.com/void-linux/void-packages/pull/27253
zstd: update to 1.4.7.
A patch file from https://github.com/void-linux/void-packages/pull/27253.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zstd-1.4.7-27253.patch --]
[-- Type: text/x-diff, Size: 3112 bytes --]
From f43099ca2f10e976e1ba7044e989f3b02e921bb6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
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 <orphan@voidlinux.org>"
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}
next prev parent reply other threads:[~2020-12-18 16:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 10:27 [PR PATCH] " 4ricci
2020-12-18 11:23 ` [PR PATCH] [Updated] " 4ricci
2020-12-18 11:37 ` 4ricci
2020-12-18 11:38 ` 4ricci
2020-12-18 13:21 ` 4ricci
2020-12-18 14:50 ` pullmoll
2020-12-18 15:40 ` ericonr
2020-12-18 16:37 ` 4ricci [this message]
2020-12-18 16:38 ` 4ricci
2020-12-18 16:46 ` ericonr
2020-12-19 10:14 ` [PR PATCH] [Updated] " 4ricci
2020-12-20 1:32 ` [PR PATCH] [Closed]: zstd: update to 1.4.8 ericonr
2020-12-20 1:32 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201218163734.QfNysRTufrBYesheg3v52q4k1QLJAZ700IeyZct5IyE@z \
--to=4ricci@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).