From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-libs/vigra/Manifest | 10 +- media-libs/vigra/files/vigra-1.11.0-gcc-7.patch | 13 -- .../vigra/files/vigra-1.11.1-lib_suffix.patch | 29 ++++ media-libs/vigra/vigra-1.11.0.ebuild | 139 ------------------ media-libs/vigra/vigra-1.11.1-r1.ebuild | 149 ------------------- media-libs/vigra/vigra-1.11.1-r2.ebuild | 163 +++++++++++++++++++++ media-libs/vigra/vigra-1.11.1.ebuild | 16 +- media-libs/vigra/vigra-9999.ebuild | 102 +++++++------ 8 files changed, 268 insertions(+), 353 deletions(-) delete mode 100644 media-libs/vigra/files/vigra-1.11.0-gcc-7.patch create mode 100644 media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch delete mode 100644 media-libs/vigra/vigra-1.11.0.ebuild delete mode 100644 media-libs/vigra/vigra-1.11.1-r1.ebuild create mode 100644 media-libs/vigra/vigra-1.11.1-r2.ebuild (limited to 'media-libs/vigra') diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index c6a84c535051..f9f9408b6c00 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,9 +1,7 @@ -AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a AUX vigra-1.11.1-fix-incorrect-template-parameter-type.patch 7890 BLAKE2B 523eec06ad9a5ef07d852e6ec8633ed480a82224a16a3028ae7f35b31518f537af94a4fa0b90ff52dc8400649928526ad391b4731aeaa948622c186d72e0a2e9 SHA512 7ea26793457eabced61470c4b25b5409cbc961443639d6c126ea479727884baf1c8b3c9808e126ae11b43675de75c510c4272e8c51fd4df111c75e88d1b24b33 -DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a +AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 -EBUILD vigra-1.11.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160 -EBUILD vigra-1.11.1-r1.ebuild 3722 BLAKE2B f2ef10f7184731055e395655a423f690d51d51ef2e08859d15bccb6b0f8776e8e2dd9a805a941a8c9d528ca58a61aaf678365b20469b1faf9189fa3401fd405f SHA512 55d35757fb0065acaf7302fceb1fd32421322012f04025824c771625151f62db7479a2f01a097cbd926a93504e15eeef474b63f82c19956431d69149ff8d22b7 -EBUILD vigra-1.11.1.ebuild 3534 BLAKE2B 373b00b7edf79ebe3e9e5ca82cabaf032c87c0e3e8a96714f4f8fe2ac19bd6c6d1b5101303f0f048e1300b8f6e87807f31e6538b1af0eec25efbad0c08e769d8 SHA512 043b293c2648690780fffd19d55029ffdcfe8d8d60f80224c7fab8527e1ad75b15d3def0a2fa3ab7f8d92a905456232662ec000d94e5ea9d56dae22df0c22378 -EBUILD vigra-9999.ebuild 3616 BLAKE2B 5a3cd490a56b4995307f7b1d24234a6a02b5aa62b1ed7b7dbb5837f3a0285d96b55d69757a25cc1ca84819000ef572928e33210484b6d7e48362e87d5088e0e3 SHA512 5f8eba44053dd7a0e4ab973c88386ebddce08591be1f2ff4c80be87a740d36bee0663ac1af4086e096ae914b7a215cdc9d072781b711b4b4e93fc7d5c5be113f +EBUILD vigra-1.11.1-r2.ebuild 3611 BLAKE2B 2997fd1e460e64d287280da3f132e94a2364bba926bc60ed34affddb03dc614d99897cdd087f1811717fce40c9da02efee18642dbc031d2f935fa44fa8f67d08 SHA512 62746b7b073c7d0b58cb1a07f421f6e7ad17f412b1ff80dda523297d5fafce392cc06632678257807251bbe53bd6be517a0365f18d1ec0d1be0840e706b6b45d +EBUILD vigra-1.11.1.ebuild 3720 BLAKE2B b8c427c008186eace9c1f4fcf937507e4c749a659fd04995bd7fbfc827c971d9f806a111242295f0c73a009a64ca2abda1986da465922adf55724102af5d711f SHA512 ab1779f2519e468579b104d53c024379f80aa49d31ac51d9177ff3542e043b47813136b3ca96c74b8f810dfc083b658e22b775388b4c921852f96a2094a5194b +EBUILD vigra-9999.ebuild 3556 BLAKE2B 3284010b2ec1871f26d960b6805a6593742ffdba62d92dcc6dc36c89fc284a06fd2f7c7dc8dcad1dce308848a41b035bd663685440aa8e2cef8b3b1dca79c20f SHA512 97cce6937d77611f715dca8d719429f8cb94ba54e6e35ce7bc2dd09edf78e9f6064619bba78259b4992b1ba25bcd421fcc1aff4058cc094b97aa1cc1e0dc9997 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71 diff --git a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch deleted file mode 100644 index 4aaba64ed5e9..000000000000 --- a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx -index a6f0f80..636cc64 100644 ---- a/include/vigra/imagecontainer.hxx -+++ b/include/vigra/imagecontainer.hxx -@@ -763,7 +763,7 @@ public: - /** swap contents of this array with the contents of other - (STL-Container interface) - */ -- void swap(const ImagePyramid &other) -+ void swap(ImagePyramid &other) - { - images_.swap(other.images_); - std::swap(lowestLevel_, other.lowestLevel_); diff --git a/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch new file mode 100644 index 000000000000..2b4b90df348f --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch @@ -0,0 +1,29 @@ +LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already. + +--- a/config/vigra-config.in 2017-05-19 17:01:08.000000000 +0200 ++++ b/config/vigra-config.in 2019-04-08 22:33:18.938060195 +0200 +@@ -68,7 +68,7 @@ + if op.impex_lib: # was: --impex_lib|--impex-lib|--libs + ldflags = [] + +- libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@' ++ libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@' + if libDir not in standardLibDirs: + ldflags.append('-L' + libDir) + +--- a/config/VigraSetDefaults.cmake 2017-05-19 17:01:08.000000000 +0200 ++++ b/config/VigraSetDefaults.cmake 2019-04-08 22:33:09.361974643 +0200 +@@ -59,13 +59,6 @@ + CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?" + FORCE) + +-IF(NOT DEFINED LIBDIR_SUFFIX) +- SET(LIBDIR_SUFFIX "") +-ENDIF() +-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX} +- CACHE STRING "Define suffix of lib directory name (empty string or 32 or 64)." +- FORCE) +- + IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX) + SET(DEPENDENCY_SEARCH_PREFIX "") + ENDIF() diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild deleted file mode 100644 index 566354ca414b..000000000000 --- a/media-libs/vigra/vigra-1.11.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -MY_P=${P}-src -MY_V=${PV//\./-} -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,xml" -inherit cmake-utils python-r1 - -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" -HOMEPAGE="https://ukoethe.github.io/vigra/" -SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" - -# runtime dependency on python:2.7 is required by the vigra-config script -RDEPEND=" - dev-lang/python:2.7 - >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] - fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) - tiff? ( media-libs/tiff:0= ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) - ) - test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" - -REQUIRED_USE=" - doc? ( hdf5 fftw ) - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-gcc-7.patch -) - -pkg_setup() { - use python && python_setup -} - -src_prepare() { - einfo "Removing shipped docs and VCS files" - rm -rf doc || die - rm .git* .travis.yml || die - - cmake-utils_src_prepare - - # Don't use python_fix_shebang because we can't put this behind USE="python" - sed -i -e '/env/s:python:python2:' config/vigra-config.in || die -} - -src_configure() { - vigra_configure() { - local libdir="$(get_libdir)" - - local mycmakeargs=( - -DAUTOEXEC_TESTS=OFF - -DDOCDIR="${BUILD_DIR}/doc" - -DDOCINSTALL="share/doc/${P}" - -DLIBDIR_SUFFIX="${libdir/lib}" - -DUSE_DOC=$(usex doc ON OFF) # unused - -DUSE_FFTW3=$(usex fftw ON OFF) # unused - -DUSE_JPEG=$(usex jpeg ON OFF) # unused - -DUSE_MPI=$(usex mpi ON OFF) # unused - -DUSE_PNG=$(usex png ON OFF) # unused - -DUSE_TIFF=$(usex tiff ON OFF) # unused - -DWITH_HDF5=$(usex hdf5 ON OFF) - -DWITH_OPENEXR=$(usex openexr ON OFF) - -DWITH_VALGRIND=$(usex valgrind ON OFF) - -DWITH_VIGRANUMPY=$(usex python ON OFF) - -DBUILD_TESTING=$(usex test ON OFF) # unused - -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused - -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused - ) - cmake-utils_src_configure - } - - if use python; then - python_foreach_impl vigra_configure - else - # required for docdir - _cmake_check_build_dir init - vigra_configure - fi -} - -src_compile() { - local VIGRA_BUILD_DIR - vigra_compile() { - cmake-utils_src_compile - VIGRA_BUILD_DIR="${BUILD_DIR}" - } - if use python; then - python_foreach_impl vigra_compile - else - vigra_compile - fi - - if use doc; then - einfo "Generating Documentation" - # use build dir from last compile command - VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc - fi -} - -src_install() { - if use python; then - python_foreach_impl cmake-utils_src_install - python_optimize - else - cmake-utils_src_install - fi -} - -src_test() { - # perhaps disable tests (see #390447) - vigra_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_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-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r1.ebuild deleted file mode 100644 index c5e8c814dae8..000000000000 --- a/media-libs/vigra/vigra-1.11.1-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -MY_P="${P}-src" -MY_V="${PV//\./-}" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,xml" - -inherit cmake-utils 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-${MY_V}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~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" - -# runtime dependency on python:2.7 is required by the vigra-config script -RDEPEND=" - dev-lang/python:2.7 - >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] - fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) - tiff? ( media-libs/tiff:0= ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) - ) - test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" - -REQUIRED_USE=" - doc? ( hdf5 fftw ) - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" - -# Severely broken, also disabled in Fedora, bugs #390447, #653442 -RESTRICT="test" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" -) - -pkg_setup() { - use python && python_setup -} - -src_prepare() { - einfo "Removing shipped docs and VCS files" - rm -rf doc || die - rm .git* .travis.yml || die - - cmake-utils_src_prepare - - # Don't use python_fix_shebang because we can't put this behind USE="python" - sed -i -e '/env/s:python:python2:' config/vigra-config.in || die -} - -src_configure() { - vigra_configure() { - local libdir="$(get_libdir)" - - local mycmakeargs=( - -DAUTOEXEC_TESTS=OFF - -DDOCDIR="${BUILD_DIR}/doc" - -DDOCINSTALL="share/doc/${P}" - -DLIBDIR_SUFFIX="${libdir/lib}" - -DUSE_DOC=$(usex doc ON OFF) # unused - -DUSE_FFTW3=$(usex fftw ON OFF) # unused - -DUSE_JPEG=$(usex jpeg ON OFF) # unused - -DUSE_MPI=$(usex mpi ON OFF) # unused - -DUSE_PNG=$(usex png ON OFF) # unused - -DUSE_TIFF=$(usex tiff ON OFF) # unused - -DWITH_HDF5=$(usex hdf5 ON OFF) - -DWITH_OPENEXR=$(usex openexr ON OFF) - -DWITH_VALGRIND=$(usex valgrind ON OFF) - -DWITH_VIGRANUMPY=$(usex python ON OFF) - -DBUILD_TESTING=$(usex test ON OFF) # unused - -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused - -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused - ) - cmake-utils_src_configure - } - - if use python; then - python_foreach_impl vigra_configure - else - # required for docdir - _cmake_check_build_dir init - vigra_configure - fi -} - -src_compile() { - local VIGRA_BUILD_DIR - vigra_compile() { - cmake-utils_src_compile - VIGRA_BUILD_DIR="${BUILD_DIR}" - } - if use python; then - python_foreach_impl vigra_compile - else - vigra_compile - fi - - if use doc; then - einfo "Generating Documentation" - # use build dir from last compile command - VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc - fi -} - -src_install() { - if use python; then - python_foreach_impl cmake-utils_src_install - python_optimize - else - cmake-utils_src_install - fi -} - -src_test() { - # perhaps disable tests (see #390447) - vigra_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_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-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild new file mode 100644 index 000000000000..d24961a71f19 --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${P}-src" +MY_V="${PV//\./-}" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads,xml" +inherit cmake-utils 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-${MY_V}/${MY_P}.tar.gz" + KEYWORDS="amd64 ~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=" + doc? ( hdf5 fftw ) + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" + +BDEPEND=" + doc? ( + app-doc/doxygen + >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] + ) + test? ( + >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] + valgrind? ( dev-util/valgrind ) + ) +" +# runtime dependency on python:2.7 is required by the vigra-config script +DEPEND=" + dev-lang/python:2.7 + fftw? ( sci-libs/fftw:3.0 ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( + media-libs/openexr:= + media-libs/ilmbase:= + ) + png? ( media-libs/libpng:0= ) + python? ( + dev-libs/boost:=[python?,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + tiff? ( media-libs/tiff:0= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +# Severely broken, also disabled in Fedora, bugs #390447, #653442 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" + "${FILESDIR}/${P}-lib_suffix.patch" +) + +pkg_setup() { + if use python || use doc; then + python_setup + fi +} + +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-utils_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 + 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:python2:' config/vigra-config.in || die +} + +src_configure() { + vigra_configure() { + local mycmakeargs=( + -DAUTOEXEC_TESTS=OFF + -DDOCDIR="${BUILD_DIR}/doc" + -DDOCINSTALL="share/doc/${PF}" + -DWITH_HDF5=$(usex hdf5) + -DWITH_OPENEXR=$(usex openexr) + -DWITH_VALGRIND=$(usex valgrind) + -DWITH_VIGRANUMPY=$(usex python) + ) + cmake-utils_src_configure + } + + if use python; then + python_foreach_impl vigra_configure + else + # required for docdir + _cmake_check_build_dir init + vigra_configure + fi +} + +src_compile() { + local VIGRA_BUILD_DIR + vigra_compile() { + cmake-utils_src_compile + VIGRA_BUILD_DIR="${BUILD_DIR}" + } + if use python; then + python_foreach_impl vigra_compile + else + vigra_compile + fi + + if use doc; then + einfo "Generating Documentation" + # use build dir from last compile command + VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc + fi +} + +src_install() { + if use python; then + python_foreach_impl cmake-utils_src_install + python_optimize + else + cmake-utils_src_install + fi +} + +src_test() { + # perhaps disable tests (see #390447) + vigra_test() { + PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_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.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild index 44a25f14450a..b2db9b985bc5 100644 --- a/media-libs/vigra/vigra-1.11.1.ebuild +++ b/media-libs/vigra/vigra-1.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,11 +11,17 @@ inherit cmake-utils python-r1 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" HOMEPAGE="https://ukoethe.github.io/vigra/" -SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" + +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-${MY_V}/${MY_P}.tar.gz" + KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" # runtime dependency on python:2.7 is required by the vigra-config script @@ -48,6 +54,10 @@ RESTRICT="test" DOCS=( README.md ) +PATCHES=( + "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" +) + pkg_setup() { use python && python_setup } diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 4073587b7131..6f78ecb71516 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + MY_P="${P}-src" MY_V="${PV//\./-}" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads,xml" - inherit cmake-utils python-r1 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" @@ -22,74 +22,90 @@ fi LICENSE="MIT" SLOT="0" -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib" + +REQUIRED_USE=" + doc? ( hdf5 fftw ) + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" +BDEPEND=" + doc? ( + app-doc/doxygen + >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] + ) + test? ( + >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] + valgrind? ( dev-util/valgrind ) + ) +" # runtime dependency on python:2.7 is required by the vigra-config script -RDEPEND=" +DEPEND=" dev-lang/python:2.7 - >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( virtual/jpeg:0 ) - openexr? ( media-libs/openexr:= ) + openexr? ( + media-libs/openexr:= + media-libs/ilmbase:= + ) png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) - tiff? ( media-libs/tiff:0= ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) + python? ( + dev-libs/boost:=[python?,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ${PYTHON_DEPS} ) - test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" - -REQUIRED_USE=" - doc? ( hdf5 fftw ) - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" + tiff? ( media-libs/tiff:0= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" # Severely broken, also disabled in Fedora, bugs #390447, #653442 RESTRICT="test" -DOCS=( README.md ) +PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" ) pkg_setup() { - use python && python_setup + if use python || use doc; then + python_setup + fi } src_prepare() { - einfo "Removing shipped docs and VCS files" - rm -rf doc || die + 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-utils_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 + 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:python2:' config/vigra-config.in || die } src_configure() { vigra_configure() { - local libdir="$(get_libdir)" - local mycmakeargs=( -DAUTOEXEC_TESTS=OFF -DDOCDIR="${BUILD_DIR}/doc" - -DDOCINSTALL="share/doc/${P}" - -DLIBDIR_SUFFIX="${libdir/lib}" - -DUSE_DOC=$(usex doc ON OFF) # unused - -DUSE_FFTW3=$(usex fftw ON OFF) # unused - -DUSE_JPEG=$(usex jpeg ON OFF) # unused - -DUSE_MPI=$(usex mpi ON OFF) # unused - -DUSE_PNG=$(usex png ON OFF) # unused - -DUSE_TIFF=$(usex tiff ON OFF) # unused - -DWITH_HDF5=$(usex hdf5 ON OFF) - -DWITH_OPENEXR=$(usex openexr ON OFF) - -DWITH_VALGRIND=$(usex valgrind ON OFF) - -DWITH_VIGRANUMPY=$(usex python ON OFF) - -DBUILD_TESTING=$(usex test ON OFF) # unused - -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused - -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused + -DDOCINSTALL="share/doc/${PF}" + -DWITH_HDF5=$(usex hdf5) + -DWITH_OPENEXR=$(usex openexr) + -DWITH_VALGRIND=$(usex valgrind) + -DWITH_VIGRANUMPY=$(usex python) ) cmake-utils_src_configure } -- cgit v1.2.3