commit: c20e014a0a9927935e6e0c5e2533b35504148f59 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Wed Aug 29 10:17:03 2018 +0000 Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Wed Aug 29 10:17:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20e014a
media-video/vdr: gcc7 compile issius fixed in extpng Package-Manager: Portage-2.3.48, Repoman-2.3.10 media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch | 16 ++++++++++++++++ media-video/vdr/vdr-2.2.0-r3.ebuild | 1 + 2 files changed, 17 insertions(+) diff --git a/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch new file mode 100644 index 00000000000..e00453c2a72 --- /dev/null +++ b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch @@ -0,0 +1,16 @@ +fix compile issius gcc7: ISO C++ forbids comparison between pointer and integer +https://www.linuxtv.org/pipermail/vdr/2017-March/029230.html + +Signed-of by: Joerg Bornkessel <[email protected]> (29 Aug 2018) +diff -Naur vdr-2.2.0.orig/osdbase.c vdr-2.2.0/osdbase.c +--- vdr-2.2.0.orig/osdbase.c 2018-08-29 11:59:49.522326559 +0200 ++++ vdr-2.2.0/osdbase.c 2018-08-29 11:59:13.861326559 +0200 +@@ -525,7 +525,7 @@ + #ifdef USE_MENUSELECTION + i = 0; + item_nr = 0; +- if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { ++ if (s && (s = skipspace(s)) != NULL && '0' <= s[i] && s[i] <= '9') { + do { + item_nr = item_nr * 10 + (s[i] - '0'); + } diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild index dbb8e986c4a..1da9aad71f8 100644 --- a/media-video/vdr/vdr-2.2.0-r3.ebuild +++ b/media-video/vdr/vdr-2.2.0-r3.ebuild @@ -219,6 +219,7 @@ src_prepare() { #gcc-7.2, this will fix only the core vdr, not the extpatch eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch" + eapply "${FILESDIR}/${P}_gcc7extpng.patch" # fix some makefile issues sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
