commit: 63fb00b3235ba162859a170aed29626ecfe7ba4e Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Thu May 13 19:06:50 2021 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> 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 <hd_brummy <AT> 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 <hd_bru...@gentoo.org> (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<char>(audioStreamLanguageCode), static_cast<char>(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<char>(subtitleStreamLanguageCode), static_cast<char>(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 }
