[gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/files/, media-tv/mythtv/

[Andreas Sturmlechner]

commit:     c6efb1db19f9073bfd64c4a00e99fde85b05e9e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 11:12:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 11:14:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6efb1db

media-tv/mythtv: Fix build with >=media-libs/exiv2-0.27.1

Thanks-to: Amel Hodzic <ilmostro7 <AT> gmail.com>
Closes: https://bugs.gentoo.org/691904
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mythtv/files/mythtv-29.1-exiv2-0.27.1.patch     | 21 +++++++++++++++++++++
 media-tv/mythtv/mythtv-29.1-r1.ebuild               |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch b/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch
new file mode 100644
index 00000000000..afdf423355e
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch
@@ -0,0 +1,21 @@
+Fix build with exiv2-0.27.1
+Thanks-to: Amel Hodzic <ilmostro7@×××××.com>
+
+--- a/libs/libmythmetadata/imagemetadata.cpp
++++ b/libs/libmythmetadata/imagemetadata.cpp
+@@ -7,14 +7,7 @@ 
+ #include "exitcodes.h"        // for ffprobe
+ 
+ // libexiv2 for Exif metadata
+-//#include <exiv2/exiv2.hpp>
+-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
+-// file.  Using image.hpp instead seems to work.
+-#ifdef _MSC_VER
+-#include <exiv2/src/image.hpp>
+-#else
+-#include <exiv2/image.hpp>
+-#endif
++#include <exiv2/exiv2.hpp>
+ 
+ // To read FFMPEG Metadata
+ extern "C" {

diff --git a/media-tv/mythtv/mythtv-29.1-r1.ebuild b/media-tv/mythtv/mythtv-29.1-r1.ebuild
index 85c778c6135..05fc9479744 100644
--- a/media-tv/mythtv/mythtv-29.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-29.1-r1.ebuild
@@ -156,6 +156,8 @@ to journald via the console at the notice verbosity.
 
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 691904
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}