gentoo resync : 22.05.2021

3 files changed, 31 insertions, 5 deletions

diff --git a/media-plugins/vdr-dvd/Manifest b/media-plugins/vdr-dvd/Manifest
index f1030c0047c2..951725ab0e25 100644
--- a/media-plugins/vdr-dvd/Manifest
+++ b/media-plugins/vdr-dvd/Manifest
@@ -2,7 +2,8 @@ AUX confd 470 BLAKE2B 216d5bbc04120c9e6adb1936a99e2833f3ea1bcab87aa679982ed95c1c
 AUX rc-addon.sh 253 BLAKE2B 38562c548f0da59dccd753838c110c42b181299e0961e85635262c925849406376cdf2fe9fce012510d34c1e119bd66b1fc2c27bb4a505f1483c7db7b9ae0693 SHA512 3e4b5dc48dd6a542885c2daba35c843232f271433667c0b9b0d70c7da85851f4bd72faa4e395221e4bc213ccadf949479b4b3b4e8bcf0804397ac254283fb064
 AUX vdr-dvd-0.3.7_pre20090106-compile_warnings.diff 1981 BLAKE2B 71861a2c2157fb7492ef45522351db5f1945d1f5f10fd706d91d035f1310676a9c938f2ef7c7e1ea2c239bdb559d7c2bbf9ccebcc3c17643db4a72e3569425f3 SHA512 71849e905a564d904e933a7bd754dae97a22c87b30a9ae865d963203eae3c20177fb86469aa38473f1f6559361e9b4681a9b67c55576797d876b06e3a98249d8
 AUX vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch 515 BLAKE2B bad58e77b1522b38b5dcf8b5bc98ebd86727a20fe3ecc2b75e54b0f8b029c2a067f3417df56fa9da2622882ddf8a2249522b507d603af87b109ffbd67fa383e7 SHA512 6b9c30630b56712e20391a84120aef311ff9b28618cdcb1bef88f3d4b2239b6d776629aa6759bdfb8855279a479fbef076ca994a58220f698ebb2160c1e59237
+AUX vdr-dvd-0.3.7_pre20090106_clang.patch 1453 BLAKE2B 261418e9ce88227801d5daecd25802eb30882df0a75a9c102b30c0d4d129e49244dc1dbf1c112d0973d991f4b37bb9c60d9b0066afc39dc28b306cbd71aec5ec SHA512 99759f1924e32b4fa321bec8796b9c1ca9dfa44754d4f572ba426039b81b7a7e41510b9e9911451a93d63d9e83d626dbb8acca1703b92762f6baece9841195f5
 DIST vdr-dvd-cvs-20090106.tar.bz2 65387 BLAKE2B 3642fb4d7d38916b6dfdcba6ea891a84fafee63e3991b18574bf2d33b42f4f59a936a91d364fd523f26f2a0f96bd0c5879955491fd5ec353f201dcff040598be SHA512 7e0f24cfbd7567d46eed73ca52826970a21d2cd49089cc019f24eced88dde83db2b14222a9a01ed37d376b323f82b53947d9f9c675c32ce775a487baaddb4b26
 EBUILD vdr-dvd-0.3.7_pre20090106-r1.ebuild 828 BLAKE2B a5c141dcaae2a761884fad7a09afaf87eed6e32abe054ee653e1d21e7e0b8aff6ac23653f4785e1b6c6714fcc6360fc28c02448c422a8f194b1e1305ec6b9257 SHA512 214b032d3d12112c6c656cec6b26af35695d3d28404fc549f06797235400ae004b5ac116f009361bfa2cf8cd93764bc0acead9a3596a609436d6266e0b573aed
-EBUILD vdr-dvd-0.3.7_pre20090106-r3.ebuild 956 BLAKE2B 5c6776869723df9a8c3bf047a20f54b1c65222ff624f6f78cc713c7d42fc381135ef6338aca6605b3feb8bf8b7aa48aca8302ed97dea43886429bd91b211f133 SHA512 70299f758198ac9358c45445100d0453a8538dfe04a3c75ae6d00d4b538bd6ade991b44fcde4e69411b2f1a78271578903f4cf0a5051776376498a569db66015
+EBUILD vdr-dvd-0.3.7_pre20090106-r4.ebuild 930 BLAKE2B 59a95523e71789c959f7ba4f6998c7dd4f41f95f6b5a13abf7ac53a07433ea99ee3acb476e80f086cdfa046bfd7ce9d2c9b49acc437bfa334ac7870b6d0a6c07 SHA512 0b97ae9f3127ef30acd56c63fc0226441e93b0aafeedaca8026a79f534ddf6e6f14982fa6f11bfb20525324f0430d13d8d23cf79adac1a14d28a7c522e341310
 MISC metadata.xml 328 BLAKE2B 0f5c6cdc22ec685b01c2e575a7174c54606bd4ef1788ba9620f39b8fdefcd0d1dc7c9e700526bd3ff8a76227aa0330f75eae20443dd66488ef659304c26bb6f3 SHA512 7fd018f41e9f03001189d7bb44253e933b5b789ecbff062b2b58ea5e7e6b6d758180deb537d179ad35bf57e7526a980ea6cea7f46c962428ce737ddd68d5b94b
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 000000000000..7816e84b2a6b
--- /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_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);
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
index 972e5b505006..2412c3d519a3 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
 }