gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-plugins/vdr-dvd: clang compile fixed

Browse Source 
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@gentoo.org>
This commit is contained in:
Joerg Bornkessel
2021-05-13 21:06:50 +02:00
parent a2520d4e63
commit 63fb00b323
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch Normal file
View File

@@ -0,0 +1,26 @@
clang compilefix
wrt bug 740276
Signed-off-by: Joerg Bornkessel <hd_brummy@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);

7
media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild → media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
View File

@@ -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
}