summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-08-14 13:12:05 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-08-14 13:14:42 +0200
commitc6efb1db19f9073bfd64c4a00e99fde85b05e9e0 (patch)
treec6da2f030c6fbe78d2ac2f70a0f8e63a5d4693dc
parentdev-util/kdevelop: Drop 5.3.2 (diff)
downloadgentoo-c6efb1db19f9073bfd64c4a00e99fde85b05e9e0.tar.gz
gentoo-c6efb1db19f9073bfd64c4a00e99fde85b05e9e0.tar.bz2
gentoo-c6efb1db19f9073bfd64c4a00e99fde85b05e9e0.zip
media-tv/mythtv: Fix build with >=media-libs/exiv2-0.27.1
Thanks-to: Amel Hodzic <ilmostro7@gmail.com> Closes: https://bugs.gentoo.org/691904 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch21
-rw-r--r--media-tv/mythtv/mythtv-29.1-r1.ebuild2
2 files changed, 23 insertions, 0 deletions
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 000000000000..afdf423355ed
--- /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@gmail.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 85c778c61351..05fc94797448 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}