media-tv/mythtv: Fix build with glibc-2.25, bug 604430

Closes: https://bugs.gentoo.org/604430
Package-Manager: Portage-2.3.12, Repoman-2.3.3

diff --git a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
new file mode 100644 (file)
index 0000000..343a808
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
@@ -0,0 +1,29 @@
+From b012ff0f6b284969183863d42a6a14eb77ed0a1d Mon Sep 17 00:00:00 2001
+From: Stuart Auchterlonie <stuarta@mythtv.org>
+Date: Tue, 6 Jun 2017 22:39:03 +0100
+Subject: [PATCH] Refs #13047 - major() and minor() are defined in
+ <sys/sysmacros.h>
+
+On BSD platforms they remain defined in <sys/types.h>
+
+(cherry picked from commit eca27c542b70deb58e50ad4581b2d6f6b2e1d3c2)
+---
+ mythtv/libs/libmythtv/videosource.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
+index 97618adc80..09dd95073d 100644
+--- a/mythtv/libs/libmythtv/videosource.cpp
++++ b/mythtv/libs/libmythtv/videosource.cpp
+@@ -3,7 +3,11 @@
+ // Standard UNIX C headers
+ #include <unistd.h>
+ #include <fcntl.h>
++#if defined(__FreeBSD__) || CONFIG_DARWIN || defined(__OpenBSD__)
+ #include <sys/types.h>
++#else
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/stat.h>
+ 
+ // C++ headers

diff --git a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
index ac83e415065f30023e1535470d78e5e414b0a4dd..4d9566ab9533440d6bb9a51012bc14214c931866 100644 (file)
--- a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
@@ -159,6 +159,7 @@ src_prepare() {
 
        echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
 
+       epatch "${FILESDIR}/${P}-glibc225.patch"
        epatch_user
 }