cleanup; fixed compile with vdr-2.1.2, reported/tested by T.Eckert on vdrportal.de #post1179845

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

7 files changed, 22 insertions, 196 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 956fcb3ae05d..6824bff81e40 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-mplayer
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.29 2013/01/09 21:48:55 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.30 2014/01/08 14:57:18 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.10.0/01_gentoo.diff, -files/0.10.0/series,
+  -files/0.10.1/01_gentoo.diff, -vdr-mplayer-0.10.0.ebuild,
+  -vdr-mplayer-0.10.1.ebuild, vdr-mplayer-0.10.2.ebuild:
+  cleanup; fixed compile with vdr-2.1.2, reported/tested by T.Eckert on
+  vdrportal.de #post1179845
 
   09 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-mplayer-0.10.2.ebuild:
diff --git a/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff
deleted file mode 100644
index 9e82ab14dab5..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-fix some path for gentoo install
-
-Joerg Bornkessel <hd_brummy@gentoo.org>
-Index: mp3-0.10.0/Makefile
-===================================================================
---- mp3-0.10.0.orig/Makefile
-+++ mp3-0.10.0/Makefile
-@@ -22,14 +22,14 @@
- # in the VDR directory an set them there.
- 
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
- 
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
- 
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
- 
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
-Index: mp3-0.10.0/mplayer.c
-===================================================================
---- mp3-0.10.0.orig/mplayer.c
-+++ mp3-0.10.0/mplayer.c
-@@ -825,7 +825,7 @@ bool cPluginMPlayer::Start(void)
- {
-   if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
-   i18n_name=Name();
--  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
-+  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayer/mplayersources.conf"));
-   if(MPlaySources.Count()<1) {
-     esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
-     fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
diff --git a/media-plugins/vdr-mplayer/files/0.10.0/series b/media-plugins/vdr-mplayer/files/0.10.0/series
deleted file mode 100644
index 65a3f0ae0891..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.0/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gentoo.diff
diff --git a/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff
deleted file mode 100644
index 6eb95c7239ca..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur mp3-0.10.1.orig/Makefile mp3-0.10.1/Makefile
---- mp3-0.10.1.orig/Makefile	2008-03-02 16:58:40.988974674 +0100
-+++ mp3-0.10.1/Makefile	2008-03-02 16:59:36.879557750 +0100
-@@ -24,14 +24,14 @@
- # in the VDR directory an set them there.
- 
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
- 
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
- 
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
- 
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
-diff -Naur mp3-0.10.1.orig/mplayer.c mp3-0.10.1/mplayer.c
---- mp3-0.10.1.orig/mplayer.c	2008-03-02 16:58:41.068960305 +0100
-+++ mp3-0.10.1/mplayer.c	2008-03-02 17:00:53.845333952 +0100
-@@ -832,7 +832,7 @@
- #else
-   i18n_name="vdr-mplayer";
- #endif
--  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
-+  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayer/mplayersources.conf"));
-   if(MPlaySources.Count()<1) {
-     esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
-     fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild
deleted file mode 100644
index 1b0751029475..000000000000
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild,v 1.5 2011/03/31 15:25:50 ssuominen Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: Play video files not supported by VDR with mplayer (divx and more)"
-HOMEPAGE="http://www.muempf.de/"
-SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.2"
-
-RDEPEND="${DEPEND}
-	|| ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 )
-	virtual/eject"
-
-S=${WORKDIR}/mp3-${PV}
-
-PATCHES=("${FILESDIR}/${PV}/01_gentoo.diff")
-
-VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
-VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/mplayer
-	doins   "${FILESDIR}/mplayersources.conf"
-
-	into /usr/share/vdr/mplayer
-	newbin examples/mount.sh.example mount-mplayer.sh
-
-	dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Edit all config's /etc/vdr/plugins/mplayer"
-	echo
-
-	if ! has_version "media-plugins/vdr-mp3ng" ; then
-		elog "Splitted ebuild!, no support for Audio files"
-		elog "To play mp3, ogg and wav files,"
-		elog "emerge media-plugins/vdr-mp3ng -pv"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
deleted file mode 100644
index 7486f5827400..000000000000
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.1.ebuild,v 1.6 2011/03/31 15:25:50 ssuominen Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: Play video files not supported by VDR with mplayer (divx and more)"
-HOMEPAGE="http://www.muempf.de/"
-SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.2"
-
-RDEPEND="${DEPEND}
-	|| ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 )
-	virtual/eject"
-
-S=${WORKDIR}/mp3-${PV}
-
-PATCHES=( "${FILESDIR}/${PV}/01_gentoo.diff"
-	"${FILESDIR}/${P}-glibc-2.10.patch" )
-
-VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
-VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i Makefile -e "s:i18n.c:i18n.h:g"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/mplayer
-	doins   "${FILESDIR}/mplayersources.conf"
-
-	into /usr/share/vdr/mplayer
-	newbin examples/mount.sh.example mount-mplayer.sh
-
-	dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Edit all config's /etc/vdr/plugins/mplayer"
-	echo
-
-	if ! has_version "media-plugins/vdr-mp3ng" ; then
-		elog "Splitted ebuild!, no support for Audio files"
-		elog "To play mp3, ogg and wav files,"
-		elog "emerge media-plugins/vdr-mp3ng -pv"
-		elog "or"
-		elog "emerge media-plugins/vdr-mp3 -pv"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild
index 8b65f40b4f67..02fe35346d58 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild,v 1.3 2013/01/09 21:48:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild,v 1.4 2014/01/08 14:57:18 hd_brummy Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit vdr-plugin-2
 
@@ -28,6 +28,16 @@ PATCHES=( "${FILESDIR}/${PV}/01_gentoo.diff" )
 VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
 VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh
 
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
+		-i decoder.c \
+		-i player-mplayer.c
+	fi
+}
+
 src_install() {
 	vdr-plugin-2_src_install