commit: ecadc9d1ebd6bff62bc1df3d617e7e6e8ab90ae5 Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Tue Feb 15 23:14:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 15 23:41:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadc9d1
media-libs/vigra: fix OpenEXR-3 dependency Without the patch, OpenEXR-3 support is not included, regardless of USE=openexr (...) -- Searching for OpenEXR -- in default locations -- Could NOT find OpenEXR (missing: OPENEXR_HALF_LIBRARY OPENEXR_ILMIMF_LIBRARY) (...) With it, hugin-2021.0.0 (correctly) detects OpenEXR-3 support in vigra, and compiles just fine, closing below bug. (Upstream patch was modified scrubbed) Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://bugs.gentoo.org/823632 Closes: https://github.com/gentoo/gentoo/pull/24205 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/vigra/files/vigra-1.11.1-openexr3.patch | 37 +++++ media-libs/vigra/vigra-1.11.1-r5.ebuild | 161 +++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/media-libs/vigra/files/vigra-1.11.1-openexr3.patch b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch new file mode 100644 index 000000000000..703cd22b9321 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-openexr3.patch @@ -0,0 +1,37 @@ +https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch +https://bugs.gentoo.org/823632 +--- a/CMakeLists.txt ++++ b/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) +--- a/src/impex/CMakeLists.txt ++++ b/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/media-libs/vigra/vigra-1.11.1-r5.ebuild b/media-libs/vigra/vigra-1.11.1-r5.ebuild new file mode 100644 index 000000000000..f11ce7a0baef --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1-r5.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_REQ_USE="threads(+),xml" +inherit cmake flag-o-matic python-r1 + +DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" +HOMEPAGE="https://ukoethe.github.io/vigra/"; + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"; + KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib" + +REQUIRED_USE=" + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" + +BDEPEND=" + test? ( + >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] + valgrind? ( dev-util/valgrind ) + ) +" +# runtime dependency on python is required by the vigra-config script +DEPEND=" + fftw? ( sci-libs/fftw:3.0= ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( + dev-libs/imath:= + media-libs/openexr:= + ) + png? ( media-libs/libpng:0= ) + python? ( + ${PYTHON_DEPS} + dev-libs/boost:=[python?,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) + tiff? ( media-libs/tiff:0= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${PYTHON_DEPS} + ${DEPEND} +" + +# Severely broken, also disabled in Fedora, bugs #390447, #653442 +RESTRICT="test" + +PATCHES=( + # git master + "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" + "${FILESDIR}/${P}-boost-python.patch" + "${FILESDIR}/${P}-python3.7.patch" # bug 701208 + "${FILESDIR}/${P}-gcc-10.patch" # bug 723302 + # TODO: upstream + "${FILESDIR}/${P}-lib_suffix.patch" + "${FILESDIR}/${P}-cmake-module-dir.patch" + "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 + "${FILESDIR}/${P}-openexr3.patch" +) + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + vigra_disable() { + if ! use ${1}; then + sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \ + -i CMakeLists.txt || die "failed to disable ${1}" + fi + } + + cmake_src_prepare + + vigra_disable fftw fftw3 + vigra_disable fftw fftw3f + vigra_disable jpeg + vigra_disable png + vigra_disable tiff + vigra_disable zlib + + # Don't use python_fix_shebang because we can't put this behind USE="python" + sed -i -e '/env/s:python:python3:' config/vigra-config.in || die + + use doc || cmake_comment_add_subdirectory docsrc + + if ! use test; then + cmake_comment_add_subdirectory test + cmake_run_in vigranumpy cmake_comment_add_subdirectory test + fi +} + +src_configure() { + # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) + # bug #808731 + use hdf5 && append-cppflags -DH5_USE_110_API + + vigra_configure() { + local mycmakeargs=( + -DAUTOEXEC_TESTS=OFF + -DDOCINSTALL="share/doc/${PF}/html" + -DWITH_HDF5=$(usex hdf5) + -DWITH_OPENEXR=$(usex openexr) + -DWITH_VALGRIND=$(usex valgrind) + -DWITH_VIGRANUMPY=$(usex python) + ) + cmake_src_configure + } + + if use python; then + python_foreach_impl vigra_configure + else + vigra_configure + fi +} + +src_compile() { + local VIGRA_BUILD_DIR + vigra_compile() { + cmake_src_compile + VIGRA_BUILD_DIR="${BUILD_DIR}" + } + if use python; then + python_foreach_impl vigra_compile + else + vigra_compile + fi +} + +src_install() { + if use python; then + python_foreach_impl cmake_src_install + python_optimize + else + cmake_src_install + fi +} + +src_test() { + # perhaps disable tests (see #390447) + vigra_test() { + PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test + } + if use python; then + python_foreach_impl vigra_test + else + vigra_test + fi +}
