diff --git a/zstd/.SRCINFO b/zstd/.SRCINFO index 7bb321a..50aaaa0 100644 --- a/zstd/.SRCINFO +++ b/zstd/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zstd pkgdesc = Zstandard - Fast real-time compression algorithm - pkgver = 1.5.2 - pkgrel = 8 + pkgver = 1.5.4 + pkgrel = 1 url = https://facebook.github.io/zstd/ arch = x86_64 license = BSD @@ -16,15 +16,12 @@ pkgbase = zstd depends = lz4 provides = libzstd.so options = debug - source = https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.zst - source = https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.zst.sig - source = fix_perf.patch + source = https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.zst + source = https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.zst.sig validpgpkeys = 4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD - sha256sums = 3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f + sha256sums = 6925880b84aca086308c27036ef1c16e76817372301ead7c37f90e23567f704e sha256sums = SKIP - sha256sums = 07db9fe01b7164fc7180a52c43d79c1ae4d15abb5669cbf91a5c9c7f357d5f7e - b2sums = 513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0b06237f6fe3f756862c63de0aa146d6a23cb4111c16e6459608d115f1 + b2sums = 8caea5dae06928076c2e54b059a501bd757663bae5948cb49ae32a7591c11636b22cb3b45d4f91653da800e1815cf5b28f72c69f4696ada4fdc746a272239da9 b2sums = SKIP - b2sums = 26e25d98485bacc8295a0add027b86ae8e386a9164c13ffd5497796c8e8da5122f0e9724c0e727e59712ab142ac62cf6fcbb4ae08e35c696874b863eead05ed4 pkgname = zstd diff --git a/zstd/PKGBUILD b/zstd/PKGBUILD index 0fdb8ad..09b75d0 100644 --- a/zstd/PKGBUILD +++ b/zstd/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Johan Förberg pkgname=zstd -pkgver=1.5.2 -pkgrel=8 +pkgver=1.5.4 +pkgrel=1 pkgdesc='Zstandard - Fast real-time compression algorithm' url='https://facebook.github.io/zstd/' arch=(x86_64) @@ -14,19 +14,16 @@ depends=(glibc gcc-libs zlib xz lz4) makedepends=(cmake gtest ninja) provides=(libzstd.so) options=(debug) -source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig} - fix_perf.patch) -sha256sums=('3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f' - 'SKIP' - '07db9fe01b7164fc7180a52c43d79c1ae4d15abb5669cbf91a5c9c7f357d5f7e') -b2sums=('513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0b06237f6fe3f756862c63de0aa146d6a23cb4111c16e6459608d115f1' - 'SKIP' - '26e25d98485bacc8295a0add027b86ae8e386a9164c13ffd5497796c8e8da5122f0e9724c0e727e59712ab142ac62cf6fcbb4ae08e35c696874b863eead05ed4') +source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig}) +sha256sums=('6925880b84aca086308c27036ef1c16e76817372301ead7c37f90e23567f704e' + 'SKIP') +b2sums=('8caea5dae06928076c2e54b059a501bd757663bae5948cb49ae32a7591c11636b22cb3b45d4f91653da800e1815cf5b28f72c69f4696ada4fdc746a272239da9' + 'SKIP') validpgpkeys=(4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD) prepare() { cd ${pkgname}-${pkgver} - patch -Np1 -i ../fix_perf.patch + # avoid error on tests without static libs, we use LD_LIBRARY_PATH sed '/build static library to build tests/d' -i build/cmake/CMakeLists.txt sed 's/libzstd_static/libzstd_shared/g' -i build/cmake/tests/CMakeLists.txt diff --git a/zstd/fix_perf.patch b/zstd/fix_perf.patch deleted file mode 100644 index 65f397e..0000000 --- a/zstd/fix_perf.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eceecc5b2cade40e2ffe7e4ff4c7d2e16883961a Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Sun, 19 Jun 2022 14:52:32 -0700 -Subject: [PATCH] removed explicit compilation standard from cmake script - -it's not expected to be useful -and can actually lead to subtle side effects -such as #3163. ---- - .../cmake/CMakeModules/AddZstdCompilationFlags.cmake | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -index e23b9d603e..8d04458c3e 100644 ---- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -@@ -22,10 +22,12 @@ endfunction() - - macro(ADD_ZSTD_COMPILATION_FLAGS) - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW -- #Set c++11 by default -- EnableCompilerFlag("-std=c++11" false true) -- #Set c99 by default -- EnableCompilerFlag("-std=c99" true false) -+ # It's possible to select the exact standard used for compilation. -+ # It's not necessary, but can be employed for specific purposes. -+ # Note that zstd source code is compatible with both C++98 and above -+ # and C-gnu90 (c90 + long long + variadic macros ) and above -+ # EnableCompilerFlag("-std=c++11" false true) # Set C++ compilation to c++11 standard -+ # EnableCompilerFlag("-std=c99" true false) # Set C compiation to c99 standard - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC) - # clang-cl normally maps -Wall to -Weverything. - EnableCompilerFlag("/clang:-Wall" true true) -@@ -48,7 +50,7 @@ macro(ADD_ZSTD_COMPILATION_FLAGS) - if (CMAKE_GENERATOR MATCHES "Visual Studio" AND ACTIVATE_MULTITHREADED_COMPILATION) - EnableCompilerFlag("/MP" true true) - endif () -- -+ - # UNICODE SUPPORT - EnableCompilerFlag("/D_UNICODE" true true) - EnableCompilerFlag("/DUNICODE" true true)