| 1 |
commit: 70a4d56ed241a93887cd16d7b390cab7e2bff5e6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 14 15:48:22 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 14 15:50:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a4d56e |
| 7 |
|
| 8 |
media-gfx/autopano-sift-C: EAPI-6 bump, drop superfluous versionator |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild | 15 ++++++++------- |
| 14 |
.../autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch | 4 ++-- |
| 15 |
2 files changed, 10 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild |
| 18 |
index 3e9405ae158..6bf149ec603 100644 |
| 19 |
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild |
| 20 |
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild |
| 21 |
@@ -1,8 +1,9 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=5 |
| 27 |
-inherit cmake-utils eutils versionator |
| 28 |
+EAPI=6 |
| 29 |
+ |
| 30 |
+inherit cmake-utils |
| 31 |
|
| 32 |
DESCRIPTION="SIFT algorithm for automatic panorama creation in C" |
| 33 |
HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" |
| 34 |
@@ -13,15 +14,15 @@ SLOT="0" |
| 35 |
KEYWORDS="amd64 x86" |
| 36 |
IUSE="" |
| 37 |
|
| 38 |
-S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)" |
| 39 |
- |
| 40 |
-RDEPEND="!media-gfx/autopano-sift |
| 41 |
+DEPEND=" |
| 42 |
dev-libs/libxml2 |
| 43 |
media-libs/libpano13:0= |
| 44 |
media-libs/libpng:0= |
| 45 |
media-libs/tiff:0= |
| 46 |
sys-libs/zlib |
| 47 |
virtual/jpeg:0" |
| 48 |
-DEPEND="${RDEPEND}" |
| 49 |
+RDEPEND="${DEPEND} |
| 50 |
+ !media-gfx/autopano-sift |
| 51 |
+" |
| 52 |
|
| 53 |
PATCHES=( "${FILESDIR}"/${P}-lm.patch ) |
| 54 |
|
| 55 |
diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch |
| 56 |
index 97619975d9b..e6141fffc0a 100644 |
| 57 |
--- a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch |
| 58 |
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch |
| 59 |
@@ -1,8 +1,8 @@ |
| 60 |
Link against -lm (mathlib) because ScaleSpace.c (which is part of the internal libsift.a) |
| 61 |
is using the exp() function, see http://bugs.gentoo.org/472150 |
| 62 |
|
| 63 |
---- CMakeLists.txt |
| 64 |
-+++ CMakeLists.txt |
| 65 |
+--- a/CMakeLists.txt |
| 66 |
++++ b/CMakeLists.txt |
| 67 |
@@ -121,7 +121,7 @@ |
| 68 |
|
| 69 |
ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES}) |
Archives