community/vigra to 1.11.1-31

community/vigra/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase=vigra
 pkgname=(vigra vigra-doc)
 pkgver=1.11.1
-pkgrel=30
+pkgrel=31
 pkgdesc="Computer vision library"
 arch=(x86_64)
 url="https://ukoethe.github.io/vigra/"
@@ -19,10 +19,12 @@ makedepends=(# runtime deps
              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
+        vigra-openexr3.patch)
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf'
             'f151f902483dfa2b1f3d431f54bb161300cf184158c9f416fa653d19ab363cc4'
-            '8fcdcce50c377be44387cbd4a001dadf5e03b32483de55c05a359c887e95a05b')
+            '8fcdcce50c377be44387cbd4a001dadf5e03b32483de55c05a359c887e95a05b'
+            '2572717e39f916c7c463b8f49306b683c5923906be2721f7da181c58b3a2b34b')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
@@ -30,6 +32,7 @@ prepare() {
   patch -Np1 -i ../fix-incorrect-template-parameter-type.patch
   # python 3.7 compat
   patch -Np1 -i ../py3.7.diff
+  patch -p1 < ../vigra-openexr3.patch # Fix build with openexr 3
 }
 
 build() {

community/vigra/vigra-openexr3.patch

@@ -0,0 +1,21 @@
+diff --git a/config/FindOpenEXR.cmake b/config/FindOpenEXR.cmake
+index ef36cdbf..0423e247 100644
+--- a/config/FindOpenEXR.cmake
++++ b/config/FindOpenEXR.cmake
+@@ -23,6 +23,16 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    find_package(Threads)
++    SET(OPENEXR_FOUND TRUE)
++    SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
++    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++    SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++    return()
++endif()
++
+ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
+ 
+ FOREACH(V "" -2_2 -2_1 -2_0 -1_7)