From 63fb00b3235ba162859a170aed29626ecfe7ba4e Mon Sep 17 00:00:00 2001
From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Thu, 13 May 2021 21:06:50 +0200
Subject: 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@gentoo.org>
---
 .../files/vdr-dvd-0.3.7_pre20090106_clang.patch    | 26 +++++++++++++
 .../vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild    | 44 ----------------------
 .../vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild    | 43 +++++++++++++++++++++
 3 files changed, 69 insertions(+), 44 deletions(-)
 create mode 100644 media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch
 delete mode 100644 media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild
 create mode 100644 media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild

(limited to 'media-plugins/vdr-dvd')

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-r3.ebuild
deleted file mode 100644
index 972e5b505006..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-MY_P=${PN}-cvs-${PV#*_pre}
-S=${WORKDIR}/${MY_P#vdr-}
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="https://sourceforge.net/projects/dvdplugin"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-video/vdr-1.6.0
-	>=media-libs/libdvdnav-4.2.0
-	>=media-libs/a52dec-0.7.4"
-DEPEND="${RDEPEND}"
-
-# vdr-plugin-2.eclass fix
-KEEP_I18NOBJECT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-compile_warnings.diff
-	"${FILESDIR}"/${P}-fix-dvdnav-using-c++-keywords.patch
-	)
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-2.1.3"; then
-		sed -i player-dvd.c -e "s:DeviceTrickSpeed(sp):DeviceTrickSpeed(sp,true):"
-	fi
-
-	#bug 787485
-	sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile
-	#bug 787488
-	sed -e "s|min(|std::min(|" -i control-dvd.c
-}
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
new file mode 100644
index 000000000000..2412c3d519a3
--- /dev/null
+++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+MY_P=${PN}-cvs-${PV#*_pre}
+S=${WORKDIR}/${MY_P#vdr-}
+
+DESCRIPTION="VDR Plugin: DVD-Player"
+HOMEPAGE="https://sourceforge.net/projects/dvdplugin"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/vdr-1.6.0
+	>=media-libs/libdvdnav-4.2.0
+	>=media-libs/a52dec-0.7.4"
+DEPEND="${RDEPEND}"
+
+# vdr-plugin-2.eclass fix
+KEEP_I18NOBJECT="yes"
+
+PATCHES=(
+	"${FILESDIR}/${P}-compile_warnings.diff"
+	"${FILESDIR}/${P}-fix-dvdnav-using-c++-keywords.patch"
+	"${FILESDIR}/${P}_clang.patch"
+	)
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.1.3"; then
+		sed -i player-dvd.c -e "s:DeviceTrickSpeed(sp):DeviceTrickSpeed(sp,true):"
+	fi
+
+	#bug 787485
+	sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile
+}
-- 
cgit v1.2.3-65-gdbad