From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- media-libs/vigra/Manifest | 5 +- media-libs/vigra/files/vigra-1.11.1-openexr3.patch | 37 +++++ media-libs/vigra/vigra-1.11.1-r4.ebuild | 160 ++++++++++++++++++++ media-libs/vigra/vigra-1.11.1-r6.ebuild | 161 +++++++++++++++++++++ media-libs/vigra/vigra-9999.ebuild | 37 ++--- 5 files changed, 371 insertions(+), 29 deletions(-) create mode 100644 media-libs/vigra/files/vigra-1.11.1-openexr3.patch create mode 100644 media-libs/vigra/vigra-1.11.1-r4.ebuild create mode 100644 media-libs/vigra/vigra-1.11.1-r6.ebuild (limited to 'media-libs/vigra') diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index d6e45364aba3..960772f56123 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -3,9 +3,12 @@ AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62 AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33 AUX vigra-1.11.1-gcc-10.patch 1506 BLAKE2B d61312f7cc082b81dc72003a1425a0c4b73670da4069c7ffd5426f83666a163ecb20d71250ea30aac200ab129458ae090cd844c50e66741c72cc8b74d2c7c52a SHA512 166b0eceb0509dff80c9ca172601926398ffc3b0f780058b8f5dede4a914aeecfe259b3c31469ce01b317af675c62e33bbe5bbe56b922b74ffdd4e0b5655845e AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f +AUX vigra-1.11.1-openexr3.patch 1063 BLAKE2B 92a08dfdb56a006a6449ea8fa4def9d68aad820f71e6a8f23d40a3b925d664dc8be1156f0247d34fd0433e23baa4bfadac839ce3edba6462275d2db7322a8fd0 SHA512 8dfd95c67df159c258d0b19f7485eb1c5a73c58a4b36a0ec4472e1dc23551e52647e2cc1be5bc0f4d290816ba50bd5329b1c73cd0a25babf10421c43a6a6e125 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 EBUILD vigra-1.11.1-r3.ebuild 3676 BLAKE2B 70b2a540d238343b9a4d52ba1f952fd6fb7ffca34a411629e98d40dd5b341e44b87d520467f1e1d6fd5daeed7a09384f98b21f8c3327423102d4d9977c3741a5 SHA512 39c4098f1732798880af0222ad787582bc9850d1fe9e9fa31470b1faaa01457055e81c9d24bb1e676793156a078de2ebdd7e4b2b8a02a6298ac3d9a6873ec37e -EBUILD vigra-9999.ebuild 3985 BLAKE2B 859cb2ecdfd49d2d2d74835e7d0917da2f0d07557946bf64d1bfecdc7e0de4381fbdd8fb04ffb911eaf9c361425192855b66ce4785f7d9fed4840fb402d8e4c4 SHA512 3215777489c73de11b1721077c8b456d43315a0277791366b46ad912266a8d42c9871736db5ac8d4ce5419a08c71d712ee4510159e90876c5bef358a82fdc46d +EBUILD vigra-1.11.1-r4.ebuild 3674 BLAKE2B cf1890f16e8b4246b057affa681ec7cc625f15f800463f9e11cd6389152cf102817b84776c8f0a5b6df3d7efdee20a0a5fc56a3d74b6a62b1da4d0786fb944a3 SHA512 efae8eb542861c8aaa458330a08739a1ea3a273ec6e5da0f3c0668627ebba34cbafd8b26a28cf1a14dc2d1da38bf64054edf3e7e46737473c2c09d43aff67ce6 +EBUILD vigra-1.11.1-r6.ebuild 3724 BLAKE2B 2753e1c2b2e845b3059c6d1830933d2c0a3f65e52a2f6a911516ee7503166c574ef46ef1361d950e1f8ebb24419d493eadc214bf7f86b4535044b137d8b96b31 SHA512 420c4880a07a6d70cf9b5f74415620614ce8eb60f6ea485071edfa0878c84363b11a13bbde9be7229fa9b9dd700c2bf4a6438b1f94a088540df4826e77720638 +EBUILD vigra-9999.ebuild 3502 BLAKE2B d2ea17d2419a847f93d1da38d92a1e449a179be2dbcc3d434d2c65f361341f7fb35fc7397f46d15b16abb570c2134319055c3966ebde0f92fe49a67905024e02 SHA512 52b09a08590340ecfe27584ea2a91ed24e81539effd22b9aecb9ae0d35de230765b0d9829eccb55ecae52e0245220e596ea435a3e796f8e39318ce213903e32b MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821 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-r4.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild new file mode 100644 index 000000000000..be3e2f9fe820 --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1-r4.ebuild @@ -0,0 +1,160 @@ +# 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 +) + +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 +} diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild new file mode 100644 index 000000000000..6724c62fa033 --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1-r6.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..10} ) +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-3.1.4-r2:= + >=media-libs/openexr-3:0= + ) + 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 +} diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 171eedd560f8..f842c53d7500 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE="threads(+),xml" inherit cmake flag-o-matic python-r1 @@ -23,15 +23,10 @@ SLOT="0" IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib" REQUIRED_USE=" - doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} ) python? ( hdf5 ${PYTHON_REQUIRED_USE} ) test? ( hdf5 python fftw )" BDEPEND=" - doc? ( - app-doc/doxygen - >=dev-python/sphinx-1.1.3-r5 - ) test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] valgrind? ( dev-util/valgrind ) @@ -39,12 +34,12 @@ BDEPEND=" " # runtime dependency on python is required by the vigra-config script DEPEND=" - fftw? ( sci-libs/fftw:3.0 ) + fftw? ( sci-libs/fftw:3.0= ) hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( virtual/jpeg:0 ) openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= + >=dev-libs/imath-3.1.4-r2:= + >=media-libs/openexr-3:0= ) png? ( media-libs/libpng:0= ) python? ( @@ -70,9 +65,7 @@ PATCHES=( ) pkg_setup() { - if use python || use doc; then - python_setup - fi + use python && python_setup } src_prepare() { @@ -85,10 +78,6 @@ src_prepare() { cmake_src_prepare - if [[ ${PV} != *9999 ]]; then - rm -r doc || die "failed to remove shipped docs" - fi - vigra_disable fftw fftw3 vigra_disable fftw fftw3f vigra_disable jpeg @@ -99,6 +88,8 @@ src_prepare() { # 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 @@ -113,8 +104,7 @@ src_configure() { vigra_configure() { local mycmakeargs=( -DAUTOEXEC_TESTS=OFF - -DDOCDIR="${BUILD_DIR}/doc" - -DDOCINSTALL="share/doc/${PF}" + -DDOCINSTALL="share/doc/${PF}/html" -DWITH_HDF5=$(usex hdf5) -DWITH_OPENEXR=$(usex openexr) -DWITH_VALGRIND=$(usex valgrind) @@ -126,8 +116,6 @@ src_configure() { if use python; then python_foreach_impl vigra_configure else - # required for docdir - _cmake_check_build_dir init vigra_configure fi } @@ -143,13 +131,6 @@ src_compile() { else vigra_compile fi - - if use doc; then - einfo "Generating Documentation" - doxygen -u ${VIGRA_BUILD_DIR}/docsrc/Doxyfile 2>/dev/null || die - # use build dir from last compile command - VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc - fi } src_install() { -- cgit v1.2.3