From 65c83a0584ba35e18f99d072f4cdf3fe10ff3541 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 18 Jul 2019 10:33:21 +0300 Subject: [PATCH] zstd: Update to 1.4.0 --- zstd/PKGBUILD | 22 +++++++++++++--------- zstd/install-pkgconfig.patch | 11 +++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 zstd/install-pkgconfig.patch diff --git a/zstd/PKGBUILD b/zstd/PKGBUILD index 23ea0a83..ae9f4dac 100644 --- a/zstd/PKGBUILD +++ b/zstd/PKGBUILD @@ -1,28 +1,32 @@ # Maintainer: Oleg Titov +pkgbase=zstd pkgname=('zstd' 'libzstd' 'libzstd-devel') -pkgver=1.3.8 +pkgver=1.4.0 pkgrel=1 pkgdesc="Zstandard - Fast real-time compression algorithm" arch=('i686' 'x86_64') url='https://facebook.github.io/zstd/' license=('BSD') makedepends=('gcc' 'make' 'cmake') -source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/facebook/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3') +source=(${pkgbase}-${pkgver}.tar.gz::"https://github.com/facebook/${pkgname}/archive/v${pkgver}.tar.gz" + install-pkgconfig.patch) +sha256sums=('63be339137d2b683c6d19a9e34f4fb684790e864fee13c7dd40e197a64c705c1' + '9a8864dd11ad6f1eaf1e11ee19adfdbc4e023f20b14b429b8af2b387ffffdef4') options=(!libtool) prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p1 -i ${srcdir}/install-pkgconfig.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - ../${pkgname}-${pkgver}/build/cmake + -DCMAKE_INSTALL_PREFIX=/usr \ + ../${pkgbase}-${pkgver}/build/cmake make install DESTDIR="${srcdir}/dest" } @@ -31,11 +35,11 @@ package_zstd() { groups=('libraries') depends=('gcc-libs' 'libzstd') - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" mkdir -p ${pkgdir}/usr cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/bin/ rm -f ${pkgdir}/usr/bin/*.dll - install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" } package_libzstd() { diff --git a/zstd/install-pkgconfig.patch b/zstd/install-pkgconfig.patch new file mode 100644 index 00000000..17c48620 --- /dev/null +++ b/zstd/install-pkgconfig.patch @@ -0,0 +1,11 @@ +--- zstd-1.3.8/build/cmake/lib/CMakeLists.txt.orig 2019-03-11 10:23:49.374227000 +0300 ++++ zstd-1.3.8/build/cmake/lib/CMakeLists.txt 2019-03-11 10:24:14.334270800 +0300 +@@ -165,7 +165,7 @@ + OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME}) + endif () + +-if (UNIX) ++if (NOT MSVC) + # pkg-config + set(PREFIX "${CMAKE_INSTALL_PREFIX}") + set(LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")