From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1044469-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 89D53138334
for <garchives@archives.gentoo.org>; Wed, 29 Aug 2018 10:17:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6B6FDE0839;
Wed, 29 Aug 2018 10:17:32 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 40ABBE0839
for <gentoo-commits@lists.gentoo.org>; Wed, 29 Aug 2018 10:17:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CD05A340B77
for <gentoo-commits@lists.gentoo.org>; Wed, 29 Aug 2018 10:17:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 057363B5
for <gentoo-commits@lists.gentoo.org>; Wed, 29 Aug 2018 10:17:28 +0000 (UTC)
From: "Joerg Bornkessel" <hd_brummy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Joerg Bornkessel" <hd_brummy@gentoo.org>
Message-ID: <1535537823.c20e014a0a9927935e6e0c5e2533b35504148f59.hd_brummy@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vdr/, media-video/vdr/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch media-video/vdr/vdr-2.2.0-r3.ebuild
X-VCS-Directories: media-video/vdr/ media-video/vdr/files/
X-VCS-Committer: hd_brummy
X-VCS-Committer-Name: Joerg Bornkessel
X-VCS-Revision: c20e014a0a9927935e6e0c5e2533b35504148f59
X-VCS-Branch: master
Date: Wed, 29 Aug 2018 10:17:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2c48cee1-c27e-44c4-be67-3bc3a8ddd64b
X-Archives-Hash: 4c0e5e7abfc8253552f586f0bbfe83ad
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 <hd_brummy@gentoo.org> (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):" \