From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 20E611382C5 for ; Thu, 13 May 2021 19:07:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77433E083D; Thu, 13 May 2021 19:07:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5E5F7E083D for ; Thu, 13 May 2021 19:07:32 +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 4F441340FD6 for ; Thu, 13 May 2021 19:07:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 058BD5D2 for ; Thu, 13 May 2021 19:07:30 +0000 (UTC) From: "Jörg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jörg Bornkessel" Message-ID: <1620932837.63fb00b3235ba162859a170aed29626ecfe7ba4e.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-dvd/files/, media-plugins/vdr-dvd/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild X-VCS-Directories: media-plugins/vdr-dvd/ media-plugins/vdr-dvd/files/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Jörg Bornkessel X-VCS-Revision: 63fb00b3235ba162859a170aed29626ecfe7ba4e X-VCS-Branch: master Date: Thu, 13 May 2021 19:07:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee4e17ce-a091-46ec-a76a-c1773a0803cf X-Archives-Hash: d7a726c9f06b54d50ae05639a41e934e commit: 63fb00b3235ba162859a170aed29626ecfe7ba4e Author: Joerg Bornkessel gentoo org> AuthorDate: Thu May 13 19:06:50 2021 +0000 Commit: Jörg Bornkessel gentoo org> CommitDate: Thu May 13 19:07:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fb00b3 media-plugins/vdr-dvd: clang compile fixed also reverted bug fix from wrt bug 787488 as it is fixed in main vdr sources Closes: https://bugs.gentoo.org/740276 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Joerg Bornkessel gentoo.org> .../files/vdr-dvd-0.3.7_pre20090106_clang.patch | 26 ++++++++++++++++++++++ ....ebuild => vdr-dvd-0.3.7_pre20090106-r4.ebuild} | 7 +++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch new file mode 100644 index 00000000000..7816e84b2a6 --- /dev/null +++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch @@ -0,0 +1,26 @@ +clang compilefix + +wrt bug 740276 + +Signed-off-by: Joerg Bornkessel (13 May 2021) +diff -Naur dvd-cvs-20090106.orig/player-dvd.c dvd-cvs-20090106/player-dvd.c +--- dvd-cvs-20090106.orig/player-dvd.c 2021-05-13 18:51:00.823067369 +0200 ++++ dvd-cvs-20090106/player-dvd.c 2021-05-13 18:53:17.136067369 +0200 +@@ -2707,7 +2707,7 @@ + } + + uint16_t audioStreamLanguageCode = GetAudioTrackLanguageCode(currentNavAudioTrack); +- char audioLanguageStr[3] = {audioStreamLanguageCode, audioStreamLanguageCode >> 8, 0}; ++ char audioLanguageStr[3] = {static_cast(audioStreamLanguageCode), static_cast(audioStreamLanguageCode >> 8), 0}; + if (GetAudioStreamNumbers() > 1) + sprintf(buffer,"%s %d/%d %s", audioStreamLanguageCode != 0xFFFF ? audioLanguageStr : "", GetCurrentNavAudioTrackIdx() + 1, GetAudioStreamNumbers() - 1, audioTypeDescr); + else +@@ -2725,7 +2725,7 @@ + } + + int subtitleStreamLanguageCode = GetSubtitleLanguageCode(currentNavSubpStream); +- char subtitleLanguageStr[3] = {subtitleStreamLanguageCode, subtitleStreamLanguageCode >> 8, 0}; ++ char subtitleLanguageStr[3] = {static_cast(subtitleStreamLanguageCode), static_cast(subtitleStreamLanguageCode >> 8), 0}; + + if(GetSubtitleStreamNumbers() > 2) + sprintf(buffer,"%s %d/%d", subtitleStreamLanguageCode !=0xFFFF ? subtitleLanguageStr : "", GetCurrentNavSubpStreamIdx(), GetSubtitleStreamNumbers() - 1); diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild similarity index 83% rename from media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild rename to media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild index 972e5b50500..2412c3d519a 100644 --- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild +++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild @@ -26,8 +26,9 @@ DEPEND="${RDEPEND}" KEEP_I18NOBJECT="yes" PATCHES=( - "${FILESDIR}"/${P}-compile_warnings.diff - "${FILESDIR}"/${P}-fix-dvdnav-using-c++-keywords.patch + "${FILESDIR}/${P}-compile_warnings.diff" + "${FILESDIR}/${P}-fix-dvdnav-using-c++-keywords.patch" + "${FILESDIR}/${P}_clang.patch" ) src_prepare() { @@ -39,6 +40,4 @@ src_prepare() { #bug 787485 sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile - #bug 787488 - sed -e "s|min(|std::min(|" -i control-dvd.c }