1 |
commit: 4e716ed8da37c97742a65cc17d8446640f37b4dc |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 28 12:06:34 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 28 12:26:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e716ed8 |
7 |
|
8 |
media-gfx/autopano-sift-C: Switch to cmake.eclass, fix build |
9 |
|
10 |
Thanks-to: Mr.Chauv <mr.chauv <AT> mailbox.org> |
11 |
Closes: https://bugs.gentoo.org/759514 |
12 |
Package-Manager: Portage-3.0.16, Repoman-3.0.2 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../autopano-sift-C/autopano-sift-C-2.5.1.ebuild | 11 ++++++---- |
16 |
.../autopano-sift-C-2.5.1-include-order.patch | 24 ++++++++++++++++++++++ |
17 |
2 files changed, 31 insertions(+), 4 deletions(-) |
18 |
|
19 |
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 |
20 |
index b9fffc443b2..aa638775851 100644 |
21 |
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild |
22 |
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild |
23 |
@@ -1,9 +1,9 @@ |
24 |
-# Copyright 1999-2019 Gentoo Authors |
25 |
+# Copyright 1999-2021 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI=6 |
29 |
+EAPI=7 |
30 |
|
31 |
-inherit cmake-utils |
32 |
+inherit cmake |
33 |
|
34 |
DESCRIPTION="SIFT algorithm for automatic panorama creation in C" |
35 |
HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" |
36 |
@@ -25,4 +25,7 @@ RDEPEND="${DEPEND} |
37 |
!media-gfx/autopano-sift |
38 |
" |
39 |
|
40 |
-PATCHES=( "${FILESDIR}"/${P}-lm.patch ) |
41 |
+PATCHES=( |
42 |
+ "${FILESDIR}"/${P}-lm.patch |
43 |
+ "${FILESDIR}"/${P}-include-order.patch # bug 759514 |
44 |
+) |
45 |
|
46 |
diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch |
47 |
new file mode 100644 |
48 |
index 00000000000..becab6d4aeb |
49 |
--- /dev/null |
50 |
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch |
51 |
@@ -0,0 +1,24 @@ |
52 |
+Subject: [PATCH] adjust to include order deoendency |
53 |
+ |
54 |
+--- |
55 |
+ autopano-sift-C-2.5.1/KeypointXML.c | 3 +-- |
56 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
57 |
+ |
58 |
+diff --git a/autopano-sift-C-2.5.1/KeypointXML.c b/autopano-sift-C-2.5.1/KeypointXML.c |
59 |
+index 9da70a8..30c35e1 100644 |
60 |
+--- a/KeypointXML.c |
61 |
++++ b/KeypointXML.c |
62 |
+@@ -13,10 +13,9 @@ |
63 |
+ * (C) Copyright 2004 -- Sebastian Nowozin (nowozin@××××××××××××.de) |
64 |
+ */ |
65 |
+ |
66 |
+-#include "AutoPanoSift.h" |
67 |
+- |
68 |
+ #include <libxml/xmlreader.h> |
69 |
+ #include <libxml/xmlwriter.h> |
70 |
++#include "AutoPanoSift.h" |
71 |
+ |
72 |
+ KeypointXMLList* KeypointXMLReader_ReadComplete (char* filename) |
73 |
+ { |
74 |
+-- |
75 |
+2.26.2 |