From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-libs/vigra/Manifest | 9 ++ media-libs/vigra/files/vigra-1.11.0-gcc-7.patch | 13 ++ .../vigra/files/vigra-1.9.0-automagicness.patch | 74 +++++++++++ media-libs/vigra/metadata.xml | 14 +++ media-libs/vigra/vigra-1.11.0.ebuild | 139 +++++++++++++++++++++ media-libs/vigra/vigra-1.9.0.ebuild | 98 +++++++++++++++ 6 files changed, 347 insertions(+) create mode 100644 media-libs/vigra/Manifest create mode 100644 media-libs/vigra/files/vigra-1.11.0-gcc-7.patch create mode 100644 media-libs/vigra/files/vigra-1.9.0-automagicness.patch create mode 100644 media-libs/vigra/metadata.xml create mode 100644 media-libs/vigra/vigra-1.11.0.ebuild create mode 100644 media-libs/vigra/vigra-1.9.0.ebuild (limited to 'media-libs/vigra') diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest new file mode 100644 index 000000000000..f4a3dfe6f4dc --- /dev/null +++ b/media-libs/vigra/Manifest @@ -0,0 +1,9 @@ +AUX vigra-1.11.0-gcc-7.patch 550 SHA256 2f989bee54225dcde52e4a2ea2a02365eb295b56d5d1f46d5ee0894306eb52d1 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a WHIRLPOOL 724425fbb0d16f26f9be988c3f8e715c8eab4996e7b8394496d6000d6929c9f89f2ab47c34b92ed71e1e637fdc92015d03734c2d5f3ed0b95a738a72a88d8cd2 +AUX vigra-1.9.0-automagicness.patch 2470 SHA256 5eadf96f9468b60f978ab051c84ce55379ddc709bb4a50284d8b1d532e4eb699 SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44 WHIRLPOOL cf35f6ecd0f407a9dd87824fb0ee4df6a31aee16abd61843d7e8ca1f32cebe0a00891dd4e2669651a6dcb7cfc85b7a9982bf27684e6a511f9a03b9add6084a29 +DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 68617de347eae7d4700a8f66cd59ce31d6cd92ffb4a235b4df34c688673af5cb SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a WHIRLPOOL 1dc73a42b5033c88427850d72078475211a206d9af69209a5d3d05d1b117baef651ccb8232b0c0428b775160feda28b08aae3f14ab07c353de1b076664a0e105 +DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9 +EBUILD vigra-1.11.0.ebuild 3505 SHA256 a7be65722250b134cf9a24fe1f8fcdd453700f18a18ef71521649acd70b5d01a SHA512 80fc790c2284f9576905bb58b387483c2954183af071132efd37facd3d53666c4de7ba9d832434866cbffb8700f286cf1c17aec9663cca0b067fe1a57ba1d286 WHIRLPOOL 94e837b02943762ca3c0b13d5980470f7e381053576808e551d00e1765b6336adaa1b68ab5f2cefc4ad4e7f4efaee74cd0ac6e12a1fbcc281aba0dc05d895548 +EBUILD vigra-1.9.0.ebuild 2647 SHA256 c9aa9080f22146140c7d35c2139c6b253fcbb223a92822e073875e166ae8ba75 SHA512 a1f995bca67859d072e666d16d7ddad87609dd857afde8fc2de4c56636cfbdc751b63acadd3ab06d230374da57edb49e9cc9f4bb896f6264005e54570fc96c0c WHIRLPOOL 896affe5e12dc632d2fe2b2bac76b1bde255bb9a3344fb94ad95dfd510cd7bf7fe6407359e6564a867d1bdc0cc66bccad2f1a2f9ac8679de775b8a0c37005ef5 +MISC ChangeLog 4088 SHA256 26488a6ea6552306769d6979a28d3ac7619d0dd69773758df62af433bfcbeebf SHA512 0dc18ad7e519eac11cfeb8de4bcf0a206cb5c962d470d4a0716bdea359c4902daa25d5997b9af72286ac088831ccba4aa8c8362d51558b827ab9950e17fa6387 WHIRLPOOL b6a844a3b4e7c94ec5fa96583fd86ab89a10b4846e658849357a2b451fa61059b839120314515e1039dc9ed435b869b710d69732971b90a52cf2b992559dfd48 +MISC ChangeLog-2015 10347 SHA256 730f9fa7e268a67fd1ba996d09e2697c63f2d712476cccd200db968b694a9602 SHA512 c18e08cf5d7e705c2fd2848e7df5adf48770cb5e5fd638680f62f579d8141648e0ba355a7d444626974e6ee790e925793185a564c5ce388a95e8fcf1a9110dc3 WHIRLPOOL 98ecab521abd6d87f4b2cee2391c1041810ce9a6410808696af7f2e681ab7b8d75c4a190cbc30ebde7566b8fc8bbea8f79a7df029a4e99c6ff43953f5ac601cf +MISC metadata.xml 416 SHA256 624f46caebbdf4a6ade89602fc35c61b2ad7fc66ff73db232998aa6fbeb98b03 SHA512 7178da1a6cf6488dba856d385772c3a2d29c93a51b8d7a5132094361f4693b33c1a0b206de2b66f5e8285a221876a0cc401566eba877786a6e5a9c97e3850194 WHIRLPOOL 4d0647dfbf01055260ce0e696b44c83ae098e514373ba7b1bbb94ed281736de00cb03e379b65dbd42585cab3649700a98d70613127c9f41f1e4899ef6c38e0de 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 new file mode 100644 index 000000000000..4aaba64ed5e9 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch @@ -0,0 +1,13 @@ +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.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch new file mode 100644 index 000000000000..e6deb761d1c5 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch @@ -0,0 +1,74 @@ +diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt +--- vigra-1.9.0.old/CMakeLists.txt 2013-06-04 13:38:43.158564579 +0200 ++++ vigra-1.9.0/CMakeLists.txt 2013-06-04 13:45:19.290550486 +0200 +@@ -57,13 +57,27 @@ + # search for dependencies + # + ################################################## ++OPTION(WITH_TIFF "Enable tiff support" ON) ++OPTION(WITH_JPEG "Enable jpeg support" ON) ++OPTION(WITH_PNG "Enable png support" ON) ++OPTION(WITH_OPENEXR "Enable openexr support" ON) ++OPTION(WITH_FFTW3 "Enable fftw support" ON) ++OPTION(ENABLE_DOC "Build documentation" ON) + + INCLUDE(VigraFindPackage) +-VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) +-VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) +-VIGRA_FIND_PACKAGE(PNG) +-VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3) +-VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3) ++IF(WITH_TIFF) ++ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) ++ENDIF() ++IF(WITH_JPEG) ++ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) ++ENDIF() ++IF(WITH_PNG) ++ VIGRA_FIND_PACKAGE(PNG) ++ENDIF() ++IF(WITH_FFTW3) ++ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3) ++ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3) ++ENDIF() + IF(WITH_OPENEXR) + VIGRA_FIND_PACKAGE(OpenEXR) + ENDIF() +@@ -72,8 +86,10 @@ + ENDIF() + + SET(DOXYGEN_SKIP_DOT TRUE) ++IF(ENABLE_DOC) + FIND_PACKAGE(Doxygen) + FIND_PACKAGE(PythonInterp) ++ENDIF() + + IF(WITH_VIGRANUMPY) + FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES ) +diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt +--- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:38:43.207564577 +0200 ++++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:45:51.962549323 +0200 +@@ -1,4 +1,4 @@ +-IF(PYTHON_SPHINX) ++IF(PYTHON_SPHINX AND ENABLE_DOC) + # vigranumpy documentation generation using sphinx + IF(DEFINED VIGRANUMPY_DOCDIR) + MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.") +@@ -49,7 +49,7 @@ + ${VIGRANUMPY_DOCDIR} + COMMENT "Generating vigranumpy documentation") + +-ELSE(PYTHON_SPHINX) ++ELSE(PYTHON_SPHINX AND ENABLE_DOC) + # no vigranumpy documentation if sphinx not available + ADD_CUSTOM_TARGET (doc_python + ${CMAKE_COMMAND} -E echo +@@ -57,7 +57,7 @@ + "(sphinx-build not found)" + VERBATIM) + +-ENDIF(PYTHON_SPHINX) ++ENDIF(PYTHON_SPHINX AND ENABLE_DOC) + + ADD_DEPENDENCIES(doc_python vigranumpy) + ADD_DEPENDENCIES(doc_python doc_cpp) diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml new file mode 100644 index 000000000000..aad87b83017b --- /dev/null +++ b/media-libs/vigra/metadata.xml @@ -0,0 +1,14 @@ + + + + + printing@gentoo.org + Gentoo Printing Project + + + ukoethe/vigra + + + Enable valgrind in make check + + diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild new file mode 100644 index 000000000000..2a8cb7118127 --- /dev/null +++ b/media-libs/vigra/vigra-1.11.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2017 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 ~ppc ~ppc64 ~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.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild new file mode 100644 index 000000000000..fe2fa6ed8e7f --- /dev/null +++ b/media-libs/vigra/vigra-1.9.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads,xml" + +# This ebuild could use python-r1 in the future when upstream gets Python 3.x +# support working +inherit cmake-utils eutils multilib python-single-r1 + +MY_P=${P}-src + +DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures" +HOMEPAGE="https://ukoethe.github.io/vigra/" +SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff" + +# Pull in dev-lang/python:2.7 for vigra-config which is always installed +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:= ) + jpeg? ( virtual/jpeg ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:0= ) + python? ( ${PYTHON_DEPS} ) + tiff? ( media-libs/tiff:0= )" +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) + ) + test? ( + python? ( >=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.txt ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-automagicness.patch + + # Don't build nor install API docs when not requested + use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; } + + # 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() { + local libdir=$(get_libdir) + + # required for ddocdir + _cmake_check_build_dir init + local mycmakeargs=( + -DDOCDIR="${CMAKE_BUILD_DIR}"/doc + -DLIBDIR_SUFFIX=${libdir/lib} + -DDOCINSTALL=share/doc/${PF} + -DWITH_VALGRIND=OFF + $(cmake-utils_use_with python VIGRANUMPY) + $(cmake-utils_use_with png) + $(cmake-utils_use_with jpeg) + $(cmake-utils_use_with openexr) + $(cmake-utils_use_with tiff) + $(cmake-utils_use_with fftw FFTW3) + $(cmake-utils_use_with hdf5) + $(cmake-utils_use_build test TESTING) + $(cmake-utils_use test CREATE_CTEST_TARGETS) + $(cmake-utils_use test AUTOBUILD_TESTS) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && cmake-utils_src_make doc +} + +src_test() { :; } #390447 + +src_install() { + cmake-utils_src_install + + use python && python_optimize +} -- cgit v1.2.3