From b982051e7c8e12c3810a0d21d30d687b406b3ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 09:35:57 +0000 Subject: gentoo auto-resync : 16:12:2022 - 09:35:57 --- media-libs/vigra/Manifest | 2 +- media-libs/vigra/vigra-9999-r1.ebuild | 155 ---------------------------------- media-libs/vigra/vigra-9999.ebuild | 155 ++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 156 deletions(-) delete mode 100644 media-libs/vigra/vigra-9999-r1.ebuild create mode 100644 media-libs/vigra/vigra-9999.ebuild (limited to 'media-libs/vigra') diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index 4a9540288597..d3da155e6907 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -8,5 +8,5 @@ AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782 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-r8.ebuild 3738 BLAKE2B 0d22270015bb925a481a42822a2fab441279d5381c5435f9606d42eb2d425edf05f450c67efbfa96546ec746025cb089f11010d456a985ae7dcd3094caf64544 SHA512 0286cf74edad98297bb671e22cd8ede7461c0121d845d1cd4e6a58119d4698e52adaddba415af7b871afcdcdf24fee72e37bfdabca3d5a0fb0a6b9ff5dee8b59 -EBUILD vigra-9999-r1.ebuild 3518 BLAKE2B ea581e89ccc15545dc1b0d66cf20533b5bd4b141a2d9e36e2e418a812ea125ab3f1881791bc858940103cb1341508044b0a29b409ae5faf3bb82e7647846f071 SHA512 4e00480317d42490c7b27f37c53b0d7dbccf188a63a3f217f04528ba5e06ad9a739d55546a955e291eec2cded19d6f25a96ecb15128eadb7a4eca20c9f792d38 +EBUILD vigra-9999.ebuild 3518 BLAKE2B ea581e89ccc15545dc1b0d66cf20533b5bd4b141a2d9e36e2e418a812ea125ab3f1881791bc858940103cb1341508044b0a29b409ae5faf3bb82e7647846f071 SHA512 4e00480317d42490c7b27f37c53b0d7dbccf188a63a3f217f04528ba5e06ad9a739d55546a955e291eec2cded19d6f25a96ecb15128eadb7a4eca20c9f792d38 MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821 diff --git a/media-libs/vigra/vigra-9999-r1.ebuild b/media-libs/vigra/vigra-9999-r1.ebuild deleted file mode 100644 index 352b006f77bb..000000000000 --- a/media-libs/vigra/vigra-9999-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# 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? ( media-libs/libjpeg-turbo:= ) - 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:= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${PYTHON_DEPS} - ${DEPEND} -" - -# Severely broken, also disabled in Fedora, bugs #390447, #653442 -RESTRICT="test" - -PATCHES=( - # 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 -) - -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 new file mode 100644 index 000000000000..352b006f77bb --- /dev/null +++ b/media-libs/vigra/vigra-9999.ebuild @@ -0,0 +1,155 @@ +# 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? ( media-libs/libjpeg-turbo:= ) + 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:= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${PYTHON_DEPS} + ${DEPEND} +" + +# Severely broken, also disabled in Fedora, bugs #390447, #653442 +RESTRICT="test" + +PATCHES=( + # 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 +) + +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 +} -- cgit v1.2.3