From f829d4facaa20cf23d4b9513672ae0c243c2b6ab Mon Sep 17 00:00:00 2001 From: kth5 Date: Mon, 16 Dec 2024 20:11:02 +0100 Subject: [PATCH] * update mgard to 1.5.2-2 --- mgard/.SRCINFO | 22 +++++++++++-------- mgard/.nvchecker.toml | 3 +++ mgard/PKGBUILD | 49 +++++++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 mgard/.nvchecker.toml diff --git a/mgard/.SRCINFO b/mgard/.SRCINFO index 0f55c818a4..558b99d18f 100644 --- a/mgard/.SRCINFO +++ b/mgard/.SRCINFO @@ -1,21 +1,25 @@ pkgbase = mgard pkgdesc = MultiGrid Adaptive Reduction of Data - pkgver = 1.0.0 - pkgrel = 1.1 + pkgver = 1.5.2 + pkgrel = 2 url = https://github.com/CODARcode/MGARD arch = riscv64 arch = powerpc64le - arch = powerpc arch = riscv64 - license = Apache + license = Apache-2.0 + makedepends = catch2 makedepends = cmake - depends = blas - depends = lapack + makedepends = ninja + makedepends = python + depends = gcc-libs depends = glibc - depends = yaml-cpp + depends = protobuf + depends = libprotobuf.so depends = zlib + depends = libz.so depends = zstd - source = https://github.com/CODARcode/MGARD/archive/1.0.0/mgard-1.0.0.tar.gz - sha256sums = 2dd153abc9bef7d87923cdefca6243b2050b7522e1d2b196e04c73c5cee6e880 + depends = libzstd.so + source = https://github.com/CODARcode/MGARD/archive/1.5.2/mgard-1.5.2.tar.gz + b2sums = fbebe814483f7ebbfd1f3bc33ca387fe77f7b0f0de369e5c4d2525d01172146197458e1a070824a8697fd0b9acef267f5813562aa9848db32d9175f879ce13f7 pkgname = mgard diff --git a/mgard/.nvchecker.toml b/mgard/.nvchecker.toml new file mode 100644 index 0000000000..2e0c8041d2 --- /dev/null +++ b/mgard/.nvchecker.toml @@ -0,0 +1,3 @@ +[mgard] +source = "git" +git = "https://github.com/CODARcode/MGARD.git" diff --git a/mgard/PKGBUILD b/mgard/PKGBUILD index 9a44073ba2..4535f80ddd 100644 --- a/mgard/PKGBUILD +++ b/mgard/PKGBUILD @@ -1,33 +1,50 @@ # POWER Maintainer: Alexander Baldeck # Maintainer: Bruno Pagani +# Maintainer: Jakub Klinkovský pkgname=mgard -pkgver=1.0.0 -pkgrel=1.1 +pkgver=1.5.2 +pkgrel=2 pkgdesc="MultiGrid Adaptive Reduction of Data" -arch=(riscv64 powerpc64le powerpc riscv64) +arch=(riscv64 powerpc64le riscv64) url="https://github.com/CODARcode/MGARD" -license=(Apache) -depends=(blas lapack glibc yaml-cpp zlib zstd) -makedepends=(cmake) # tclap 1.4 required but unreleased -# mgard requires catch2 3.x which is currently unreleased -#checkdepends=(catch2) +license=(Apache-2.0) +depends=( + gcc-libs + glibc + protobuf libprotobuf.so + zlib libz.so + zstd libzstd.so +) +makedepends=( + catch2 + cmake + ninja + python + #tclap # 1.4 required but not packaged +) source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('2dd153abc9bef7d87923cdefca6243b2050b7522e1d2b196e04c73c5cee6e880') +b2sums=('fbebe814483f7ebbfd1f3bc33ca387fe77f7b0f0de369e5c4d2525d01172146197458e1a070824a8697fd0b9acef267f5813562aa9848db32d9175f879ce13f7') build() { - cmake -B build -S ${pkgname^^}-${pkgver} \ + local cmake_flags=( + -B build -S ${pkgname^^}-${pkgver} -G Ninja -DCMAKE_INSTALL_PREFIX=/usr - make -C build + -DMGARD_ENABLE_SERIAL=ON + -DMGARD_ENABLE_OPENMP=ON + -DMGARD_ENABLE_MDR=ON + #-DMGARD_ENABLE_CLI=ON requires tclap 1.4 + -DBUILD_TESTING=ON + -Wno-dev + ) + cmake "${cmake_flags[@]}" + cmake --build build } check() { - cd build - ctest -v --output-on-failure + ctest --test-dir build --output-on-failure } package() { - make -C build DESTDIR="${pkgdir}" install - # Uneeded file - rm "${pkgdir}"/usr/include/mgard/MGARDConfig.hpp.in + DESTDIR="$pkgdir" cmake --install build }