version bump

Package-Manager: portage-2.1.1

6 files changed, 144 insertions, 9 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 110e6bd607a2..b3888d5faef3 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2006/09/08 09:12:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.8 2006/09/22 22:33:13 hd_brummy Exp $
+
+*vdr-mplayer-0.9.15 (22 Sep 2006)
+
+  22 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-mplayer-0.9.15-gentoo.diff,
+  +files/vdr-mplayer-0.9.15-slave-mode-default.diff,
+  +vdr-mplayer-0.9.15.ebuild:
+  version bump
 
   08 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.9.14-r2.ebuild:
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest
index 7b895c026dc3..54509c8f7109 100644
--- a/media-plugins/vdr-mplayer/Manifest
+++ b/media-plugins/vdr-mplayer/Manifest
@@ -21,7 +21,16 @@ AUX vdr-mplayer-0.9.14-slave-mode-default.diff 357 RMD160 77ed67c0621c5b85a7213c
 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
+AUX vdr-mplayer-0.9.15-gentoo.diff 1438 RMD160 634b6627ce8c437758472992c0f995bd35576e98 SHA1 e6999c59d0fd15cf6b1cec21427d6175e3ae4bf5 SHA256 2156e6c21feb8d77b3748d51046b97aed1941ded9843dc01443ccac70606c710
+MD5 53554879c1cabab357ea7eae85667ca6 files/vdr-mplayer-0.9.15-gentoo.diff 1438
+RMD160 634b6627ce8c437758472992c0f995bd35576e98 files/vdr-mplayer-0.9.15-gentoo.diff 1438
+SHA256 2156e6c21feb8d77b3748d51046b97aed1941ded9843dc01443ccac70606c710 files/vdr-mplayer-0.9.15-gentoo.diff 1438
+AUX vdr-mplayer-0.9.15-slave-mode-default.diff 432 RMD160 d9ac0893e59caf00b264d86147f7bebb2d457ca9 SHA1 a0fdaa4c9a8bfa4167b3abedf2db9d35eab17d2f SHA256 4cb5c9b41f539a71cc49de2ff1e4801ec9ad4f0a5aed261d26a9ba3c1bd3985e
+MD5 b7ca39bbdd96cd7b6f9f0257cf681838 files/vdr-mplayer-0.9.15-slave-mode-default.diff 432
+RMD160 d9ac0893e59caf00b264d86147f7bebb2d457ca9 files/vdr-mplayer-0.9.15-slave-mode-default.diff 432
+SHA256 4cb5c9b41f539a71cc49de2ff1e4801ec9ad4f0a5aed261d26a9ba3c1bd3985e files/vdr-mplayer-0.9.15-slave-mode-default.diff 432
 DIST vdr-mp3-0.9.14.tar.gz 120589 RMD160 df380f13a7a50d4e400aaed875cb7dddbc42e270 SHA1 a62511b8d8ccaba0569bb8b7a7ee6e110575b987 SHA256 c5f38e79364d7832626b907ac3316da143813b568c223d32f5005d1ed732501a
+DIST vdr-mp3-0.9.15.tar.gz 123718 RMD160 5ab5404a3c2df45df45588d33cde5ae11a433998 SHA1 e73f3ef88a2b9967b7071be805a9ce0904ef7fa4 SHA256 1c3ae584c46d41661dd320f76938fe05fd1801f53537d7e08479a13243eca3c4
 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
@@ -34,10 +43,14 @@ EBUILD vdr-mplayer-0.9.14.ebuild 1262 RMD160 ee2d79de5580bb0ec4df1f6f8819d3897c1
 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 1396 RMD160 547ec6cb2aee12a66af839b6da48075ea26bcc01 SHA1 8a5516023940d49233c3eeac2f48190be27b32c0 SHA256 22b678ff19a0ff63e4971c623bf3bb1345f6a7a6ef368d1963e1caf95051538f
-MD5 ff8693e2b10e9e9d67a52f1d560f37ab ChangeLog 1396
-RMD160 547ec6cb2aee12a66af839b6da48075ea26bcc01 ChangeLog 1396
-SHA256 22b678ff19a0ff63e4971c623bf3bb1345f6a7a6ef368d1963e1caf95051538f ChangeLog 1396
+EBUILD vdr-mplayer-0.9.15.ebuild 1299 RMD160 5de65eec86a074ac2084407658a6f5c89ffe39ce SHA1 4d9513b5144842f51485a8f0c7e01fb7691fe6e5 SHA256 b05c421b58c8d6082956e1e3cd5cafeb72b767e08951326d288f3564c23a9fd0
+MD5 159db8a208ca64a389f0ae164db301cd vdr-mplayer-0.9.15.ebuild 1299
+RMD160 5de65eec86a074ac2084407658a6f5c89ffe39ce vdr-mplayer-0.9.15.ebuild 1299
+SHA256 b05c421b58c8d6082956e1e3cd5cafeb72b767e08951326d288f3564c23a9fd0 vdr-mplayer-0.9.15.ebuild 1299
+MISC ChangeLog 1631 RMD160 4312fd848cdfc37a3b44d9a2df0ba7c1655b399b SHA1 76fa6f5cf836c132a99a30c24b67a21a91d931c7 SHA256 b0823581d6f8a571b0ae65738be55c7a21010d61e178578b930c7456f6894c36
+MD5 1426501317edcf104a5604445022384d ChangeLog 1631
+RMD160 4312fd848cdfc37a3b44d9a2df0ba7c1655b399b ChangeLog 1631
+SHA256 b0823581d6f8a571b0ae65738be55c7a21010d61e178578b930c7456f6894c36 ChangeLog 1631
 MISC metadata.xml 508 RMD160 673fd3703f2cea3b06b7a741ff4c3b7ee3659ee7 SHA1 2d2c2995418dce644b10b4e279be89b6aafd4469 SHA256 f318bda3bdd3594206fe0e0c2f92c0e726a3c43762450dc36d5623fa05f17faa
 MD5 5c13143cd80eb7d5ef43443d1e6cde83 metadata.xml 508
 RMD160 673fd3703f2cea3b06b7a741ff4c3b7ee3659ee7 metadata.xml 508
@@ -51,10 +64,14 @@ SHA256 3274c19a85d19ac42ca69da7b36f3dea0f0d22d5e60aa7a73b4bf26d458b80e3 files/di
 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
+MD5 a76565f5bca1e3d4bb6cda1bc420555e files/digest-vdr-mplayer-0.9.15 244
+RMD160 cbd23c8590c31dbb8fc951eb99fd6e00ecf6203e files/digest-vdr-mplayer-0.9.15 244
+SHA256 2915e679e7d4945c1375124ea5db869bfb79f83077e6c2782e14dba31fd080c5 files/digest-vdr-mplayer-0.9.15 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
+Comment: no further Information
 
-iD8DBQFFATQWt2vP6XvVdOcRAieqAJ9ntTJoBY7l9tkAiWSZNZJ3WSGqiQCg3yeV
-grKeiWxu6c2WHBI8NZWzMHI=
-=e0Pt
+iD8DBQFFFGTOdn07HTTCgIoRAsxzAJ4jfA+lLjDBNCl9rGWcnahISUKOhACgozd8
+p38Ho5k9AYIZlAM6s3E7wx4=
+=iWNG
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15
new file mode 100644
index 000000000000..efcf6709e518
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15
@@ -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/vdr-mplayer-0.9.15-gentoo.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff
new file mode 100644
index 000000000000..ae52fe7c71f1
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff
@@ -0,0 +1,36 @@
+fix some path for gentoo install
+
+Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur mp3-0.9.15.orig/Makefile mp3-0.9.15/Makefile
+--- mp3-0.9.15.orig/Makefile	2006-09-22 20:02:06.484888703 +0200
++++ mp3-0.9.15/Makefile	2006-09-22 20:03:09.732841453 +0200
+@@ -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.9.15.orig/mplayer.c mp3-0.9.15/mplayer.c
+--- mp3-0.9.15.orig/mplayer.c	2006-09-22 20:02:06.504889953 +0200
++++ mp3-0.9.15/mplayer.c	2006-09-22 20:06:46.998419703 +0200
+@@ -814,7 +814,7 @@
+ {
+   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/vdr-mplayer-0.9.15-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff
new file mode 100644
index 000000000000..54a6c523b11c
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff
@@ -0,0 +1,16 @@
+set slave mode on OSD to default
+
+Joerg Bornkessel <hd_brummy@gentoo.org>
+
+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.15.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
new file mode 100644
index 000000000000..cd42f07a4b2b
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
@@ -0,0 +1,55 @@
+# 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.15.ebuild,v 1.1 2006/09/22 22:33:13 hd_brummy 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}-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
+}