Changed default sources-file to refer /var/vdr/video. Moved 0.9.15 patches to own subdir. Add support for mplay-sh.

(Portage version: 2.1.2.7)

11 files changed, 119 insertions, 6 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index d0838443fbf7..f7cc329560fc 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-plugins/vdr-mplayer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.16 2007/04/17 12:50:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.17 2007/05/15 12:51:41 zzam Exp $
+
+*vdr-mplayer-0.9.15-r1 (15 May 2007)
+
+  15 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  -files/vdr-mplayer-0.9.15-gentoo.diff,
+  -files/vdr-mplayer-0.9.15-slave-mode-default.diff, +files/confd-0.9.15.sh,
+  +files/rc-addon-0.9.15.sh, +files/0.9.15/03_vdr-1.5.1.diff,
+  +files/0.9.15/01_gentoo.diff, +files/0.9.15/series,
+  -files/vdr-mplayer-0.9.15-vdr-1.5.1.patch,
+  +files/0.9.15/02_slave_mode_default.diff, files/mplayersources.conf,
+  vdr-mplayer-0.9.15.ebuild, +vdr-mplayer-0.9.15-r1.ebuild:
+  Changed default sources-file to refer /var/vdr/video. Moved 0.9.15 patches
+  to own subdir. Add support for mplay-sh.
 
   17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh:
   Removed bash specific stuff.
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff b/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff
index ae52fe7c71f1..ae52fe7c71f1 100644
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff
+++ b/media-plugins/vdr-mplayer/files/0.9.15/01_gentoo.diff
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff
index 54a6c523b11c..54a6c523b11c 100644
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff
+++ b/media-plugins/vdr-mplayer/files/0.9.15/02_slave_mode_default.diff
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch b/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff
index 50a14f47756b..50a14f47756b 100644
--- a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-vdr-1.5.1.patch
+++ b/media-plugins/vdr-mplayer/files/0.9.15/03_vdr-1.5.1.diff
diff --git a/media-plugins/vdr-mplayer/files/0.9.15/series b/media-plugins/vdr-mplayer/files/0.9.15/series
new file mode 100644
index 000000000000..7860a20767b2
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/0.9.15/series
@@ -0,0 +1,3 @@
+01_gentoo.diff
+02_slave_mode_default.diff
+03_vdr-1.5.1.diff
diff --git a/media-plugins/vdr-mplayer/files/confd-0.9.15.sh b/media-plugins/vdr-mplayer/files/confd-0.9.15.sh
new file mode 100644
index 000000000000..b336c5b9e5a1
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/confd-0.9.15.sh
@@ -0,0 +1,11 @@
+# Global config file for vdr mplayer plugin
+#
+# Restart of VDR is needed after changes
+
+
+# Selected the script to call mplayer
+#
+#   allowed value: mplay.sh mplayer.sh
+#   default value: prefer the first installed from the listed possibilities
+#
+#MPLAYER_PLUGIN_CALL="mplay.sh"
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1
new file mode 100644
index 000000000000..efcf6709e518
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15-r1
@@ -0,0 +1,3 @@
+MD5 e1c78a10d65f6422555b4755f2f634de vdr-mp3-0.9.15.tar.gz 123718
+RMD160 5ab5404a3c2df45df45588d33cde5ae11a433998 vdr-mp3-0.9.15.tar.gz 123718
+SHA256 1c3ae584c46d41661dd320f76938fe05fd1801f53537d7e08479a13243eca3c4 vdr-mp3-0.9.15.tar.gz 123718
diff --git a/media-plugins/vdr-mplayer/files/mplayersources.conf b/media-plugins/vdr-mplayer/files/mplayersources.conf
index 9ef16317c264..96858a41f028 100644
--- a/media-plugins/vdr-mplayer/files/mplayersources.conf
+++ b/media-plugins/vdr-mplayer/files/mplayersources.conf
@@ -1,3 +1,3 @@
-/video;Festplatte;0
+/var/vdr/video;Video-Verzeichnis;0
 /mnt/cdrom;CDRom;1
 
diff --git a/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh b/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh
new file mode 100644
index 000000000000..e1bea4676ee4
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh
@@ -0,0 +1,23 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/files/rc-addon-0.9.15.sh,v 1.1 2007/05/15 12:51:41 zzam Exp $
+#
+# rc-addon plugin-startup-skript for vdr-mplayer
+#
+
+: ${MPLAYER_PLUGIN_CALL:=mplay.sh}
+: ${MPLAYER_PLUGIN_MOUNT:=mount-mplayer.sh}
+
+plugin_pre_vdr_start() {
+	local P=/usr/share/vdr/mplayer/bin
+	local CALL=""
+	if [ -f $P/${MPLAYER_PLUGIN_CALL} ]; then
+		CALL=${MPLAYER_PLUGIN_CALL}
+	elif [ -f $P/mplay.sh ]; then
+		CALL=mplay.sh
+	elif [ -f $P/mplayer.sh ]; then
+		CALL=mplayer.sh
+	else
+		eerror "vdr-mplayer: No mplayer-script found"
+	fi
+	add_plugin_param "-m ${P}/${MPLAYER_PLUGIN_MOUNT}"
+	add_plugin_param "-M ${P}/${CALL}"
+}
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..97718227813e
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 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.9.15-r1.ebuild,v 1.1 2007/05/15 12:51:41 zzam Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="Video Disk Recorder Mplayer Plugin"
+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 )
+		|| ( sys-apps/eject sys-block/unieject )"
+
+S=${WORKDIR}/mp3-${PV}
+
+PATCHES="
+	${FILESDIR}/${PV}/01_gentoo.diff
+	${FILESDIR}/${PV}/02_slave_mode_default.diff
+	${FILESDIR}/${PV}/03_vdr-1.5.1.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.9.15.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
index a17f555dae68..f74f2905eefc 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9.15.ebuild,v 1.7 2007/03/25 17:41:40 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild,v 1.8 2007/05/15 12:51:41 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -21,9 +21,10 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/mp3-${PV}
 
-PATCHES="${FILESDIR}/${P}-gentoo.diff
-		${FILESDIR}/${P}-slave-mode-default.diff
-		${FILESDIR}/${P}-vdr-1.5.1.patch"
+PATCHES="
+	${FILESDIR}/${PV}/01_gentoo.diff
+	${FILESDIR}/${PV}/02_slave_mode_default.diff
+	${FILESDIR}/${PV}/03_vdr-1.5.1.diff"
 
 src_install() {