| 1 |
commit: c20e014a0a9927935e6e0c5e2533b35504148f59 |
| 2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 10:17:03 2018 +0000 |
| 4 |
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 10:17:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20e014a |
| 7 |
|
| 8 |
media-video/vdr: gcc7 compile issius fixed in extpng |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 11 |
|
| 12 |
media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch | 16 ++++++++++++++++ |
| 13 |
media-video/vdr/vdr-2.2.0-r3.ebuild | 1 + |
| 14 |
2 files changed, 17 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..e00453c2a72 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch |
| 21 |
@@ -0,0 +1,16 @@ |
| 22 |
+fix compile issius gcc7: ISO C++ forbids comparison between pointer and integer |
| 23 |
+https://www.linuxtv.org/pipermail/vdr/2017-March/029230.html |
| 24 |
+ |
| 25 |
+Signed-of by: Joerg Bornkessel <hd_brummy@g.o> (29 Aug 2018) |
| 26 |
+diff -Naur vdr-2.2.0.orig/osdbase.c vdr-2.2.0/osdbase.c |
| 27 |
+--- vdr-2.2.0.orig/osdbase.c 2018-08-29 11:59:49.522326559 +0200 |
| 28 |
++++ vdr-2.2.0/osdbase.c 2018-08-29 11:59:13.861326559 +0200 |
| 29 |
+@@ -525,7 +525,7 @@ |
| 30 |
+ #ifdef USE_MENUSELECTION |
| 31 |
+ i = 0; |
| 32 |
+ item_nr = 0; |
| 33 |
+- if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { |
| 34 |
++ if (s && (s = skipspace(s)) != NULL && '0' <= s[i] && s[i] <= '9') { |
| 35 |
+ do { |
| 36 |
+ item_nr = item_nr * 10 + (s[i] - '0'); |
| 37 |
+ } |
| 38 |
|
| 39 |
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 40 |
index dbb8e986c4a..1da9aad71f8 100644 |
| 41 |
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 42 |
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild |
| 43 |
@@ -219,6 +219,7 @@ src_prepare() { |
| 44 |
#gcc-7.2, this will fix only the core vdr, not the extpatch |
| 45 |
eapply "${FILESDIR}/${P}_unsignedtosigned.patch" |
| 46 |
eapply "${FILESDIR}/${P}_glibc-2.24.patch" |
| 47 |
+ eapply "${FILESDIR}/${P}_gcc7extpng.patch" |
| 48 |
|
| 49 |
# fix some makefile issues |
| 50 |
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \ |
Archives