[arch-commits] Commit in vigra/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Friday, March 18, 2022 @ 13:42:41
  Author: archange
Revision: 1158523

upgpkg: vigra 1.11.1.r67+g093d57d1-1

Update to current master to get latest fixes

Modified:
  vigra/trunk/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-18 13:23:14 UTC (rev 1158522)
+++ PKGBUILD	2022-03-18 13:42:41 UTC (rev 1158523)
@@ -3,8 +3,8 @@
 # Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 
 pkgname=vigra
-pkgver=1.11.1.r45+g8acd73a5
-pkgrel=6
+pkgver=1.11.1.r67+g093d57d1
+pkgrel=1
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/"
@@ -14,20 +14,29 @@
 checkdepends=(python-nose)
 optdepends=('python: for python bindings'
             'boost-libs: for python bindings')
-source=(git+https://github.com/ukoethe/vigra#commit=8acd73a5e0408326e2a3c1ed1c2c70ffe2b954d0
+source=(git+https://github.com/ukoethe/vigra#commit=093d57d15c8c237adf1704d96daa6393158ce299
+        vigra-python3.10.patch::https://github.com/ukoethe/vigra/commit/e7e656c29083729090dd3fb3ec214a888e0b3e8d.patch
+        vigra-numpy1.20.patch::https://github.com/ukoethe/vigra/commit/23ad778502c6436fb6e40ade5e9fd9ddbbad9f35.patch
+        vigra-bind-c17.patch::https://github.com/ukoethe/vigra/pull/500.patch
         vigra-openexr3.patch)
-sha256sums=(SKIP
-            2572717e39f916c7c463b8f49306b683c5923906be2721f7da181c58b3a2b34b)
+sha256sums=('SKIP'
+            '18ab55f011458963785442947ed07dd44cb93e8879a8bdda495fb330011621a4'
+            '014cff1a7e69415ec15cef6635a7279c429d5bf8df861a4d89193d2209de604d'
+            '9c2289f75e6444ad3316b0d46dd7276de10ae81d194cfa10ed84d1e5236aaea0'
+            '2572717e39f916c7c463b8f49306b683c5923906be2721f7da181c58b3a2b34b')
 
 pkgver() {
   cd ${pkgname}
-  git describe --long --tags | sed 's/^Version-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/\.g/+g/'
+  git describe --tags --match "Version-*" | sed 's/^Version-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/\.g/+g/'
 }
 
 prepare() {
   cd ${pkgbase}
-  # Fix build with openexr 3
   patch -p1 < ../vigra-openexr3.patch
+  patch -p1 < ../vigra-python3.10.patch
+  patch -p1 < ../vigra-numpy1.20.patch
+  # https://github.com/ukoethe/vigra/issues/504
+  patch -R -p1 < ../vigra-bind-c17.patch
 }
 
 build() {
@@ -34,20 +43,17 @@
   cmake -B build -S ${pkgbase} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python \
+    -DDOCINSTALL=share/doc \
     -DWITH_OPENEXR=true \
-    -DWITH_VIGRANUMPY=1 \
-    -DDOCINSTALL=share/doc \
-    -DCMAKE_C_FLAGS="-DH5_USE_110_API" \
-    -DCMAKE_CXX_FLAGS="-DH5_USE_110_API"
+    -DWITH_VIGRANUMPY=1
+    #-DBUILD_DOCS=OFF \
   make -C build
 }
 
-# Numerous failures, upstream almost dead
-# https://github.com/ukoethe/vigra/issues/409
-# https://github.com/ukoethe/vigra/issues/491
-#check() {
-#  make -C build -j1 -k check
-#}
+check() {
+  # https://github.com/ukoethe/vigra/issues/491
+  make -C build -j1 -k check || echo "Tests failed"
+}
 
 package() {
   make -C build DESTDIR="${pkgdir}" install