| 1 |
commit: 587259e86b651310073ce82055be24ac327abdc8 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 8 21:47:08 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 8 21:47:36 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587259e8 |
| 7 |
|
| 8 |
media-libs/vigra: No revbump for build fixes needed |
| 9 |
|
| 10 |
Backporting to stable to avoid rebuilds |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/664720 |
| 13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 15 |
|
| 16 |
media-libs/vigra/vigra-1.11.1.ebuild | 16 +++++++++++++--- |
| 17 |
1 file changed, 13 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild |
| 20 |
index 44a25f14450..b2db9b985bc 100644 |
| 21 |
--- a/media-libs/vigra/vigra-1.11.1.ebuild |
| 22 |
+++ b/media-libs/vigra/vigra-1.11.1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -11,11 +11,17 @@ inherit cmake-utils python-r1 |
| 30 |
|
| 31 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
| 32 |
HOMEPAGE="https://ukoethe.github.io/vigra/" |
| 33 |
-SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" |
| 34 |
+ |
| 35 |
+if [[ ${PV} == *9999 ]] ; then |
| 36 |
+ EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git" |
| 37 |
+ inherit git-r3 |
| 38 |
+else |
| 39 |
+ SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz" |
| 40 |
+ KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 41 |
+fi |
| 42 |
|
| 43 |
LICENSE="MIT" |
| 44 |
SLOT="0" |
| 45 |
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 46 |
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" |
| 47 |
|
| 48 |
# runtime dependency on python:2.7 is required by the vigra-config script |
| 49 |
@@ -48,6 +54,10 @@ RESTRICT="test" |
| 50 |
|
| 51 |
DOCS=( README.md ) |
| 52 |
|
| 53 |
+PATCHES=( |
| 54 |
+ "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" |
| 55 |
+) |
| 56 |
+ |
| 57 |
pkg_setup() { |
| 58 |
use python && python_setup |
| 59 |
} |
Archives