Set default control mode to slave.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 98 insertions, 9 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 76a5979411f2..34892e49c11d 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.4 2006/06/27 22:06:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.5 2006/07/07 08:04:00 zzam Exp $
+
+*vdr-mplayer-0.9.14-r2 (07 Jul 2006)
+
+  07 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-mplayer-0.9.14-slave-mode-default.diff,
+  +vdr-mplayer-0.9.14-r2.ebuild:
+  Set default control mode to slave.
 
   27 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.9.14-r1.ebuild:
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest
index 0ccb9eda9caf..03558c460081 100644
--- a/media-plugins/vdr-mplayer/Manifest
+++ b/media-plugins/vdr-mplayer/Manifest
@@ -17,19 +17,27 @@ AUX vdr-mplayer-0.9.14-resume.diff 1074 RMD160 d453c674c377d0afb1a749cdba4c43c71
 MD5 ecf3c88e0d7d028471801d2014f07a56 files/vdr-mplayer-0.9.14-resume.diff 1074
 RMD160 d453c674c377d0afb1a749cdba4c43c711ddce65 files/vdr-mplayer-0.9.14-resume.diff 1074
 SHA256 7bdfb3d47900289df4d5caf68f5bf1ce1b97cc69d204c541a1f1491be62e3f27 files/vdr-mplayer-0.9.14-resume.diff 1074
+AUX vdr-mplayer-0.9.14-slave-mode-default.diff 357 RMD160 77ed67c0621c5b85a7213c4ec3dd8096d157c6fa SHA1 a5e4274ff5ebdb43582f9f7f1b771d38c3ca2dad SHA256 daf220098fee991e355588bb75f004a941f9188cbf091da2a852fefb5f0f09db
+MD5 731f8b4af08ce312922dd4e323c567c5 files/vdr-mplayer-0.9.14-slave-mode-default.diff 357
+RMD160 77ed67c0621c5b85a7213c4ec3dd8096d157c6fa files/vdr-mplayer-0.9.14-slave-mode-default.diff 357
+SHA256 daf220098fee991e355588bb75f004a941f9188cbf091da2a852fefb5f0f09db files/vdr-mplayer-0.9.14-slave-mode-default.diff 357
 DIST vdr-mp3-0.9.14.tar.gz 120589 RMD160 df380f13a7a50d4e400aaed875cb7dddbc42e270 SHA1 a62511b8d8ccaba0569bb8b7a7ee6e110575b987 SHA256 c5f38e79364d7832626b907ac3316da143813b568c223d32f5005d1ed732501a
 EBUILD vdr-mplayer-0.9.14-r1.ebuild 1285 RMD160 ba205a077fd5b4ff80f2b5dea6a024d6240f49b7 SHA1 5e3eb537e7692fae905a997c4f3d4e22bf992b17 SHA256 5155319529602c3145fe711385f8678f88c1287a49e3b3e859ab48cde2953a5e
 MD5 ac9395e3ab76ca8128119c15c078489c vdr-mplayer-0.9.14-r1.ebuild 1285
 RMD160 ba205a077fd5b4ff80f2b5dea6a024d6240f49b7 vdr-mplayer-0.9.14-r1.ebuild 1285
 SHA256 5155319529602c3145fe711385f8678f88c1287a49e3b3e859ab48cde2953a5e vdr-mplayer-0.9.14-r1.ebuild 1285
+EBUILD vdr-mplayer-0.9.14-r2.ebuild 1328 RMD160 a7c85bab39d8605c647315ec8d6654d2518e7db7 SHA1 eb0af6d1922459ad4836351c7845646e254c9d52 SHA256 33046b5c13120a9a239e4edbc8797f91316f8caa8ee73a1731a87ed5854855b5
+MD5 57c54269032fd2a40de0f53be121938c vdr-mplayer-0.9.14-r2.ebuild 1328
+RMD160 a7c85bab39d8605c647315ec8d6654d2518e7db7 vdr-mplayer-0.9.14-r2.ebuild 1328
+SHA256 33046b5c13120a9a239e4edbc8797f91316f8caa8ee73a1731a87ed5854855b5 vdr-mplayer-0.9.14-r2.ebuild 1328
 EBUILD vdr-mplayer-0.9.14.ebuild 1262 RMD160 ee2d79de5580bb0ec4df1f6f8819d3897c1a9678 SHA1 e1ad2482e281e3de9234aa7bade44b2172c879b2 SHA256 95fa1ccc2c7ba5e3755d3f1a3fa867ced2f71ae2ffd2e8d5327654f60a3e81e5
 MD5 f207614c602fb114490c1f64fdf64988 vdr-mplayer-0.9.14.ebuild 1262
 RMD160 ee2d79de5580bb0ec4df1f6f8819d3897c1a9678 vdr-mplayer-0.9.14.ebuild 1262
 SHA256 95fa1ccc2c7ba5e3755d3f1a3fa867ced2f71ae2ffd2e8d5327654f60a3e81e5 vdr-mplayer-0.9.14.ebuild 1262
-MISC ChangeLog 976 RMD160 2c2123bc70c982f1b2dfc9ea817fb10e82b2c9d6 SHA1 671b686668d3267b1abfd5f03cdcd3c97dc88dcd SHA256 bb1a96751902e7b0ca4beb932ce5aadf34bcddcf84aa636546945ccf13842fbf
-MD5 83b2823c3cea79d589147eb207994461 ChangeLog 976
-RMD160 2c2123bc70c982f1b2dfc9ea817fb10e82b2c9d6 ChangeLog 976
-SHA256 bb1a96751902e7b0ca4beb932ce5aadf34bcddcf84aa636546945ccf13842fbf ChangeLog 976
+MISC ChangeLog 1191 RMD160 7eb38bc70c7c7745fae2d2155796398ade232f7d SHA1 6b98d3454ef9da042fd3bd37778a09fcc940b8e8 SHA256 32a6a8fbe910eac2a70a7ce98c48c4993a5838cb1506cc293bf1066055abb4dd
+MD5 23105bbf67a569540a60bf17feb3d182 ChangeLog 1191
+RMD160 7eb38bc70c7c7745fae2d2155796398ade232f7d ChangeLog 1191
+SHA256 32a6a8fbe910eac2a70a7ce98c48c4993a5838cb1506cc293bf1066055abb4dd ChangeLog 1191
 MISC metadata.xml 512 RMD160 969a7e1b3885e90ebe6f1eb5cfcba3c3a520afa0 SHA1 3c74689eddeb2f119b858d8cb600dea24313b664 SHA256 9581dee17491aaa1dadf47977f627db5f25bea00341e21a087e7dae1490775b0
 MD5 bbe1275ce1f4cde2cb3d401105b029b1 metadata.xml 512
 RMD160 969a7e1b3885e90ebe6f1eb5cfcba3c3a520afa0 metadata.xml 512
@@ -40,10 +48,13 @@ SHA256 3274c19a85d19ac42ca69da7b36f3dea0f0d22d5e60aa7a73b4bf26d458b80e3 files/di
 MD5 c4abfc5f014cd1c1896db8cc03ddb0fa files/digest-vdr-mplayer-0.9.14-r1 244
 RMD160 9666dc23e40c4cb1381db2724f779b8a6c24f37a files/digest-vdr-mplayer-0.9.14-r1 244
 SHA256 3274c19a85d19ac42ca69da7b36f3dea0f0d22d5e60aa7a73b4bf26d458b80e3 files/digest-vdr-mplayer-0.9.14-r1 244
+MD5 c4abfc5f014cd1c1896db8cc03ddb0fa files/digest-vdr-mplayer-0.9.14-r2 244
+RMD160 9666dc23e40c4cb1381db2724f779b8a6c24f37a files/digest-vdr-mplayer-0.9.14-r2 244
+SHA256 3274c19a85d19ac42ca69da7b36f3dea0f0d22d5e60aa7a73b4bf26d458b80e3 files/digest-vdr-mplayer-0.9.14-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEoavpZfSl1Kp5KmoRAmfxAKCJwSfwO1oi9KN9a2TjVXeEIKgFHgCeJEgu
-Vw40/VUTvvP3bAcf5RIfVD0=
-=xc07
+iD8DBQFErhV7ZfSl1Kp5KmoRAk8cAJwNMJRFyL0cNt4iUkl6eCmGgBxFNwCfT02z
+LbRQPxxMMShBGMGjcDd6gKM=
+=qNRs
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14-r2 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14-r2
new file mode 100644
index 000000000000..b1d2c6f76349
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14-r2
@@ -0,0 +1,3 @@
+MD5 acb9e781df99df66b32b15c188ea4c15 vdr-mp3-0.9.14.tar.gz 120589
+RMD160 df380f13a7a50d4e400aaed875cb7dddbc42e270 vdr-mp3-0.9.14.tar.gz 120589
+SHA256 c5f38e79364d7832626b907ac3316da143813b568c223d32f5005d1ed732501a vdr-mp3-0.9.14.tar.gz 120589
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff
new file mode 100644
index 000000000000..dd501f43a55f
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-slave-mode-default.diff
@@ -0,0 +1,12 @@
+diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c
+--- mp3-0.9.14-orig/setup-mplayer.c	2006-07-07 09:56:27.000000000 +0200
++++ mp3-0.9.14/setup-mplayer.c	2006-07-07 09:56:35.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ cMPlayerSetup::cMPlayerSetup(void)
+ {
+-  SlaveMode = 0;
++  SlaveMode = 1;
+   ResumeMode = 2;
+   HideMainMenu = 0;
+   OsdPos = 0;
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild
new file mode 100644
index 000000000000..7eb08a28829c
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 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.14-r2.ebuild,v 1.1 2006/07/07 08:04:00 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="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.6"
+
+RDEPEND="${DEPEND}
+		>=media-video/mplayer-0.90_rc4
+		>=media-video/mplayer-sh-0.8.6-r1
+		sys-apps/eject"
+
+S=${WORKDIR}/mp3-${PV}
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+		${FILESDIR}/${P}-resume.diff
+		${FILESDIR}/${P}-slave-mode-default.diff"
+
+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
+	einfo "Edit all config's /etc/vdr/plugins/mplayer"
+	echo
+
+	if ! has_version "media-plugins/vdr-mp3ng" ; then
+		einfo "Splitted ebuild!, no support for Audio files"
+		einfo "To play mp3, ogg and wav files,"
+		einfo "emerge media-plugins/vdr-mp3ng -pv"
+		echo
+	fi
+}