commit: 3212eb8d7b02addbad078efdc07839c163547363 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 21 12:31:49 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 21 12:37:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3212eb8d
media-gfx/hugin: Fix build against exiv2-0.27.1 Closes: https://bugs.gentoo.org/686366 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch | 29 ++++++++++++++++++++++ media-gfx/hugin/hugin-2019.0.0.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch new file mode 100644 index 00000000000..e22023f3998 --- /dev/null +++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch @@ -0,0 +1,29 @@ +Fix build against exiv2-0.27.1 by using upstream recommended catchall header. + +--- a/src/hugin_base/panodata/SrcPanoImage.cpp 2019-02-16 09:18:55.000000000 +0100 ++++ b/src/hugin_base/panodata/SrcPanoImage.cpp 2019-05-21 14:26:23.470193305 +0200 +@@ -40,9 +40,7 @@ + #include <vigra/diff2d.hxx> + #include <vigra/imageinfo.hxx> + #include <hugin_utils/utils.h> +-#include <exiv2/exif.hpp> +-#include <exiv2/image.hpp> +-#include <exiv2/easyaccess.hpp> ++#include <exiv2/exiv2.hpp> + #include <lensdb/LensDB.h> + #include "Exiv2Helper.h" + +--- a/src/hugin1/hugin/RawImport.cpp 2019-02-02 11:11:01.000000000 +0100 ++++ b/src/hugin1/hugin/RawImport.cpp 2019-05-21 14:33:00.522541182 +0200 +@@ -35,10 +35,7 @@ + // workaround for a conflict between exiv2 and wxWidgets/CMake built + #define HAVE_PID_T 1 + #endif +-#include <exiv2/exif.hpp> +-#include <exiv2/image.hpp> +-#include <exiv2/easyaccess.hpp> +-#include <exiv2/xmpsidecar.hpp> ++#include <exiv2/exiv2.hpp> + #ifdef __WXMSW__ + #include <wx/msw/registry.h> + #endif diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild index 543908d5bca..89e66a9dc80 100644 --- a/media-gfx/hugin/hugin-2019.0.0.ebuild +++ b/media-gfx/hugin/hugin-2019.0.0.ebuild @@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( authors.txt README TODO ) +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366 + S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 pkg_setup() {
