diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-libs/vigra | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'media-libs/vigra')
-rw-r--r-- | media-libs/vigra/Manifest | 3 | ||||
-rw-r--r-- | media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch | 139 | ||||
-rw-r--r-- | media-libs/vigra/vigra-1.11.1-r1.ebuild | 149 | ||||
-rw-r--r-- | media-libs/vigra/vigra-9999.ebuild | 144 |
4 files changed, 435 insertions, 0 deletions
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index b05b08b0508e..c6a84c535051 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,6 +1,9 @@ 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 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 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71 diff --git a/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch new file mode 100644 index 000000000000..88ed61ee374c --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-fix-incorrect-template-parameter-type.patch @@ -0,0 +1,139 @@ +From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001 +From: JaimeIvanCervantes <jimmycc80@hotmail.com> +Date: Fri, 16 Jun 2017 13:21:45 -0700 +Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type + when using unsigned int N for TinyVector SIZE. (Fixes #414) + +--- + include/vigra/multi_convolution.hxx | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx +index 1b5efa740..ec89bcf58 100644 +--- a/include/vigra/multi_convolution.hxx ++++ b/include/vigra/multi_convolution.hxx +@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source, + class T2, class S2> + void + gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + double sigma, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()); + +@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source, + class T2, class S2> + void + gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + ConvolutionOptions<N> opt); + + // likewise, but execute algorithm in parallel +@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source, + class T2, class S2> + void + gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + BlockwiseConvolutionOptions<N> opt); + } + \endcode +@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1, + class T2, class S2> + inline void + gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + ConvolutionOptions<N> opt ) + { + if(opt.to_point != typename MultiArrayShape<N>::type()) +@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1, + class T2, class S2> + inline void + gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + double sigma, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()) + { +@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src, + dest.init(0.0); + + typedef typename NumericTraits<T1>::RealPromote TmpType; +- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape()); ++ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape()); + + using namespace multi_math; + +@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src, + class T2, class S2> + void + symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()); + + // execute algorithm in parallel +@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src, + class T2, class S2> + void + symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + BlockwiseConvolutionOptions<N> opt); + } + \endcode +@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1, + class T2, class S2> + inline void + symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source, +- MultiArrayView<N, TinyVector<T2, N>, S2> dest, ++ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()) + { + if(opt.to_point != typename MultiArrayShape<N>::type()) +@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source, + template <unsigned int N, class T1, class S1, + class T2, class S2> + void +- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField, ++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField, + MultiArrayView<N, T2, S2> divergence, + ConvolutionOptions<N> const & opt); + + template <unsigned int N, class T1, class S1, + class T2, class S2> + void +- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField, ++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField, + MultiArrayView<N, T2, S2> divergence, + double sigma, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()); +@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source, + template <unsigned int N, class T1, class S1, + class T2, class S2> + void +- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField, ++ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField, + MultiArrayView<N, T2, S2> divergence, + BlockwiseConvolutionOptions<N> const & opt); + } +@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd, + template <unsigned int N, class T1, class S1, + class T2, class S2> + inline void +-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField, ++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField, + MultiArrayView<N, T2, S2> divergence, + ConvolutionOptions<N> const & opt) + { +@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve + template <unsigned int N, class T1, class S1, + class T2, class S2> + inline void +-gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField, ++gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField, + MultiArrayView<N, T2, S2> divergence, + double sigma, + ConvolutionOptions<N> opt = ConvolutionOptions<N>()) diff --git a/media-libs/vigra/vigra-1.11.1-r1.ebuild b/media-libs/vigra/vigra-1.11.1-r1.ebuild new file mode 100644 index 000000000000..c5e8c814dae8 --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1-r1.ebuild @@ -0,0 +1,149 @@ +# 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-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild new file mode 100644 index 000000000000..4073587b7131 --- /dev/null +++ b/media-libs/vigra/vigra-9999.ebuild @@ -0,0 +1,144 @@ +# 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 ) + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + einfo "Removing shipped docs and VCS files" + rm -rf doc || 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 +} |