public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/
Date: Mon,  8 Apr 2019 21:15:10 +0000 (UTC)	[thread overview]
Message-ID: <1554757982.bf5b286286b23a33a24f718e8bd765b9617f73e3.asturm@gentoo> (raw)

commit:     bf5b286286b23a33a24f718e8bd765b9617f73e3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 21:08:23 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 21:13:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b2862

media-libs/vigra: Revbump with lots of fixes from 9999

Bug: https://bugs.gentoo.org/682860
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/vigra/vigra-1.11.1-r2.ebuild | 163 ++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)

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 00000000000..97c69bf3221
--- /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
+}


             reply	other threads:[~2019-04-08 21:15 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-08 21:15 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-11  9:19 [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ Sam James
2025-02-11  9:19 Sam James
2025-02-11  8:39 Sam James
2024-12-11  1:53 Sam James
2024-08-30 14:31 Arthur Zamarin
2024-08-30 14:29 Arthur Zamarin
2024-08-30 14:23 Arthur Zamarin
2024-06-14  7:28 Sam James
2024-02-27 15:21 Michał Górny
2023-05-14 10:29 Andreas Sturmlechner
2023-05-14  0:31 Sam James
2023-05-05  9:03 Arthur Zamarin
2023-05-03 18:58 Sam James
2023-05-02 20:50 Sam James
2022-12-16  4:30 Sam James
2022-09-07  7:52 Michał Górny
2022-08-17 16:21 Matt Turner
2022-07-11  2:50 Sam James
2022-03-01  0:02 Sam James
2022-02-28 23:58 Sam James
2022-02-28  5:21 Sam James
2022-02-26  2:30 Sam James
2022-02-19 19:47 Sam James
2022-02-18 18:14 Sam James
2022-02-15 19:51 Sam James
2021-09-10  5:23 Sam James
2021-02-28 16:52 Andreas Sturmlechner
2021-01-09 19:06 Andreas Sturmlechner
2020-07-10 21:24 Andreas Sturmlechner
2020-04-17  0:04 Andreas Sturmlechner
2020-01-12 15:29 Andreas Sturmlechner
2020-01-10  1:26 Thomas Deutschmann
2019-12-31  1:06 Aaron Bauman
2019-12-30 16:14 Agostino Sarubbo
2019-11-27 14:43 Andreas Sturmlechner
2019-11-27  0:13 Andreas Sturmlechner
2019-11-27  0:13 Andreas Sturmlechner
2019-11-27  0:13 Andreas Sturmlechner
2019-10-06 14:46 Andreas Sturmlechner
2019-06-05 19:20 Andreas Sturmlechner
2019-05-20 17:22 Aaron Bauman
2019-04-24 21:33 Thomas Deutschmann
2019-04-09 14:31 Mikle Kolyada
2019-04-08 21:47 Andreas K. Hüttel
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2019-04-08 21:15 Andreas Sturmlechner
2018-04-26  5:02 Matt Turner
2018-04-25 19:27 Thomas Deutschmann
2018-04-18 18:37 Pacho Ramos
2018-04-16 16:25 Aaron Bauman
2017-11-26 23:06 David Seifert
2017-02-16  0:13 Andreas Hüttel
2017-02-11 22:03 Andreas Hüttel
2017-02-11 22:03 Andreas Hüttel
2016-09-07 18:22 Austin English
2016-08-19  5:33 Tim Harder
2016-01-30  8:10 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1554757982.bf5b286286b23a33a24f718e8bd765b9617f73e3.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox