From 1da2e3ecfe4a53813d11c0b96967c5a537ec7bc6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 26 Apr 2020 16:42:10 +0000
Subject: [PATCH] community/vigra to 1.11.1-22

---
 community/vigra/PKGBUILD | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/community/vigra/PKGBUILD b/community/vigra/PKGBUILD
index 61c748f15..a3f92336b 100644
--- a/community/vigra/PKGBUILD
+++ b/community/vigra/PKGBUILD
@@ -6,26 +6,25 @@
 #  - build v5 with -DCMAKE_CXX_FLAGS=-std=c++11 -DWITH_BOOST_THREAD=1 to fix FTBFS
 
 pkgbase=vigra
-pkgname=('vigra' 'vigra-doc')
+pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=21
+pkgrel=22
 pkgdesc="Computer vision library"
-arch=('x86_64')
+arch=(x86_64)
 url="https://ukoethe.github.io/vigra/"
-license=('custom:MIT')
+license=(custom:MIT)
 makedepends=(# runtime deps
-             'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+             libpng libtiff openexr gcc-libs sh hdf5 fftw
              # additional makedeps
-             'cmake' 'boost' 'python-numpy')
-checkdepends=('python-nose')
+             cmake boost python-numpy)
+checkdepends=(python-nose)
 source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz"
-        'fix-incorrect-template-parameter-type.patch' 'py3.7.diff')
+        fix-incorrect-template-parameter-type.patch py3.7.diff)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf'
             'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4'
             '8fcdcce50c377be44387cbd4a001dadf5e03b32483de55c05a359c887e95a05b')
 
 prepare() {
-  mkdir -p build
   cd ${pkgbase}-${pkgver}
   # https://github.com/ukoethe/vigra/issues/414
   patch -Np1 -i ../fix-incorrect-template-parameter-type.patch
@@ -34,20 +33,20 @@ prepare() {
 }
 
 build() {
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake -B build -S ${pkgbase}-${pkgver} \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DPYTHON_EXECUTABLE=/usr/bin/python \
       -DWITH_OPENEXR=true \
       -DWITH_VIGRANUMPY=1 \
       -DDOCINSTALL=share/doc \
+      -DCMAKE_C_FLAGS="-DH5_USE_110_API" \
+      -DCMAKE_CXX_FLAGS="-DH5_USE_110_API" \
       $([ $CARCH == arm ] && echo "-DCMAKE_CXX_FLAGS=-std=c++11 -DWITH_BOOST_THREAD=1")
-  make
+  make -C build
 }
 
 check() {
-  cd build
-  make -j1 -k check || warning "Tests failed" # https://github.com/ukoethe/vigra/issues/409
+  make -C build -j1 -k check || warning "Tests failed" # https://github.com/ukoethe/vigra/issues/409
 }
 
 package_vigra() {
@@ -56,10 +55,9 @@ package_vigra() {
   optdepends=('python: for python bindings'
               'boost-libs: for python bindings')
 
-  cd build
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
   # Remove doc
   rm -rf "${pkgdir}"/usr/share/doc
@@ -69,11 +67,10 @@ package_vigra-doc() {
   pkgdesc="Computer vision library - documentation and examples"
   #arch=('any') # Not supported for now, maybe later
 
-  cd build
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 
   # Remove vigra package content
   rm -rf "${pkgdir}"/usr/{bin,include,lib}
 
-  install -Dm644 "${srcdir}"/${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }