summaryrefslogtreecommitdiff
path: root/media-gfx/autopano-sift-C
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-03 10:28:17 +0000
commitd99093fb4bb5652015c06274d64083daa2439e4f (patch)
treecf61513204d97974179580065e85df5c8009087c /media-gfx/autopano-sift-C
parent463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
gentoo resync : 03.03.2021
Diffstat (limited to 'media-gfx/autopano-sift-C')
-rw-r--r--media-gfx/autopano-sift-C/Manifest3
-rw-r--r--media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild11
-rw-r--r--media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch24
3 files changed, 33 insertions, 5 deletions
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index 99cecd4bd1ce..7c4d57b5b259 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,5 @@
+AUX autopano-sift-C-2.5.1-include-order.patch 604 BLAKE2B ad43f26a0a7d4e8952e1db74bda617047e033cc89720e72e556b775948bc47d3b780cbff9bf95deb526bd4dc78f6548aca908b8f27a3845488068748eb63d0de SHA512 1d6e4e7759e9e865c8645fb612e306d2f7838d4f9356bb78f74b16fcdeec43979e416b8e183f4d7785432b65ff5603ad26f1a81505ffc068d49795d9c5f5b180
AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002
DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
-EBUILD autopano-sift-C-2.5.1.ebuild 618 BLAKE2B e2a58d968de9493c676b4f04051c0b9fc46631ab9cf074fa9f40a802f6dfa120c06f112fb1c59c6d895793ac04d6c6489b2a40db989f25c07e6925b295b75bdd SHA512 895c0f448253cdb8ace54fc0c6d9374ea50a76c79b9b468daf95d3b03681a8e9ae8eb01b57c3c6e06a2b11825a62c348afe6bc8200d1b3e70bedfa5bb43cbb56
+EBUILD autopano-sift-C-2.5.1.ebuild 666 BLAKE2B 43cd2e2ef5fcdbab227e0cdbb7fe9aaae3931fd182cdae2cf621a1c98dd4a114e23294f7dde58ee9873a0d870bff2bb0269dbef3aaf913001074e2d290b40d9b SHA512 9b87bcf4863f290f0c4abcfe7d099f9572667f40786fc5cafddea9cfc6fc106a672f2898aba219b4ed5ff5767473db02fc6ffae16fdaddc2d4d57fa7b9ed9ae1
MISC metadata.xml 242 BLAKE2B 5b14580839e0095bbf38a5ef4012ad45d44dd9923d9b1c04ce68b7a7c0ee746965553854933280c8384653cc0a67a69844a00cb7167c2fb22c1d2fb044ed016c SHA512 20b5112a69b93703ba404eeb80fbf522445c0aa1c9513ab89507f62646b4fe8bf524d558ff1299b88f5fff9d149fa03c7f35e299ad8e292b3a31944f20dceeb3
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
index b9fffc443b2a..aa6387758510 100644
--- 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="SIFT algorithm for automatic panorama creation in C"
HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"
@@ -25,4 +25,7 @@ RDEPEND="${DEPEND}
!media-gfx/autopano-sift
"
-PATCHES=( "${FILESDIR}"/${P}-lm.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-lm.patch
+ "${FILESDIR}"/${P}-include-order.patch # bug 759514
+)
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
new file mode 100644
index 000000000000..becab6d4aeb1
--- /dev/null
+++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch
@@ -0,0 +1,24 @@
+Subject: [PATCH] adjust to include order deoendency
+
+---
+ autopano-sift-C-2.5.1/KeypointXML.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/autopano-sift-C-2.5.1/KeypointXML.c b/autopano-sift-C-2.5.1/KeypointXML.c
+index 9da70a8..30c35e1 100644
+--- a/KeypointXML.c
++++ b/KeypointXML.c
+@@ -13,10 +13,9 @@
+ * (C) Copyright 2004 -- Sebastian Nowozin (nowozin@cs.tu-berlin.de)
+ */
+
+-#include "AutoPanoSift.h"
+-
+ #include <libxml/xmlreader.h>
+ #include <libxml/xmlwriter.h>
++#include "AutoPanoSift.h"
+
+ KeypointXMLList* KeypointXMLReader_ReadComplete (char* filename)
+ {
+--
+2.26.2