commit: 663937bb03ecb813f5e77c26318b875fad24ea4b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 12 20:42:06 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 15 19:50:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663937bb
media-libs/vigra: support OpenEXR 3 / imath Bug: https://bugs.gentoo.org/833158 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{vigra-9999.ebuild => vigra-1.11.1-r4.ebuild} | 46 ++++++++-------------- media-libs/vigra/vigra-9999.ebuild | 35 ++++------------ 2 files changed, 24 insertions(+), 57 deletions(-) diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild similarity index 77% copy from media-libs/vigra/vigra-9999.ebuild copy to media-libs/vigra/vigra-1.11.1-r4.ebuild index 171eedd560f8..be3e2f9fe820 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r4.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,11 +34,11 @@ 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:= + dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) @@ -63,16 +58,19 @@ RDEPEND="${PYTHON_DEPS} 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}/${PN}-1.11.1-lib_suffix.patch" - "${FILESDIR}/${PN}-1.11.1-cmake-module-dir.patch" - "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 + "${FILESDIR}/${P}-lib_suffix.patch" + "${FILESDIR}/${P}-cmake-module-dir.patch" + "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 ) pkg_setup() { - if use python || use doc; then - python_setup - fi + use python && python_setup } src_prepare() { @@ -85,10 +83,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 +93,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 +109,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 +121,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 +136,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() { diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 171eedd560f8..bcefe3e30c33 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,11 +34,11 @@ 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:= + dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:0= ) @@ -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() {
