diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch new file mode 100644 index 00000000000..b869e858b1c --- /dev/null +++ b/srcpkgs/vigra/patches/openexr3.patch @@ -0,0 +1,40 @@ +Index: vigra-1.11.1/CMakeLists.txt +=================================================================== +--- vigra-1.11.1.orig/CMakeLists.txt ++++ vigra-1.11.1/CMakeLists.txt +@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3 + + + IF(WITH_OPENEXR) ++ FIND_PACKAGE(Imath CONFIG) ++ IF(TARGET Imath::Imath) ++ FIND_PACKAGE(OpenEXR CONFIG) ++ SET(OPENEXR_LIBRARIES ++ OpenEXR::OpenEXR ++ OpenEXR::Iex ++ OpenEXR::IlmThread ++ Imath::Imath ++ ) ++ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES) ++ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR}) ++ set(OPENEXR_FOUND TRUE) ++ ELSE() + VIGRA_FIND_PACKAGE(OpenEXR) ++ ENDIF() + ENDIF() + + IF(WITH_HDF5) +Index: vigra-1.11.1/src/impex/CMakeLists.txt +=================================================================== +--- vigra-1.11.1.orig/src/impex/CMakeLists.txt ++++ vigra-1.11.1/src/impex/CMakeLists.txt +@@ -85,6 +85,7 @@ IF(TIFF_FOUND) + ENDIF(TIFF_FOUND) + + IF(OPENEXR_FOUND) ++ cmake_policy(SET CMP0028 NEW) + TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES}) + ENDIF(OPENEXR_FOUND) + + diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index d2e91a7019b..055d5a3b7f6 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,18 +1,19 @@ # Template file for 'vigra' pkgname=vigra version=1.11.1 -revision=7 +revision=8 build_style=cmake configure_args="-DWITH_OPENEXR=1" hostmakedepends="python3" makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel - boost-devel libopenexr-devel" + boost-devel libopenexr-devel imath-devel" short_desc="Image processing and analysis library" maintainer="Enno Boland " license="MIT" homepage="https://ukoethe.github.io/vigra/" distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz" checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e +make_check=no # all tests fail with: [Unknown system error -8] Process not started python_version=3 pre_configure() { @@ -27,8 +28,6 @@ post_install() { vlicense LICENSE.txt vmkdir usr/share/$pkgname mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc - vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \ - $DESTDIR/usr/bin/vigra-config } vigra-doc_package() {