Version bumped.

Package-Manager: portage-2.1.3_rc1

6 files changed, 129 insertions, 8 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 42ad9948ac40..18f49df67dac 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.18 2007/06/16 08:53:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.19 2007/06/17 12:30:18 zzam Exp $
+
+*vdr-mplayer-0.10.0 (17 Jun 2007)
+
+  17 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.10.0/01_gentoo.diff, +files/0.10.0/series,
+  +vdr-mplayer-0.10.0.ebuild:
+  Version bumped.
 
   16 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.9.15-r1.ebuild:
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest
index 0a3603e7b004..7944f846e6c3 100644
--- a/media-plugins/vdr-mplayer/Manifest
+++ b/media-plugins/vdr-mplayer/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.10.0/01_gentoo.diff 1404 RMD160 dda5911e760c503651b27c17810c27ef7cd7a97f SHA1 e77f13d2caa97a3e914ed658917a9f60464319b4 SHA256 f813becbc9d0cd67d583dbb958175403b30787c8ca01cf3e3a2878b909f66310
+MD5 af42334bc2d5d5eb662239d422c855f0 files/0.10.0/01_gentoo.diff 1404
+RMD160 dda5911e760c503651b27c17810c27ef7cd7a97f files/0.10.0/01_gentoo.diff 1404
+SHA256 f813becbc9d0cd67d583dbb958175403b30787c8ca01cf3e3a2878b909f66310 files/0.10.0/01_gentoo.diff 1404
+AUX 0.10.0/series 15 RMD160 acec575672f0029f32570ca112b6808f956dcd5e SHA1 9e525b2988b0bc333446f0efa43bd13eb3912f59 SHA256 bc0656e593953f8aa18060c652e0c4bc795471daf8af5fde6f2c5543011d7bbd
+MD5 f244a7ae1255397b1cd6a6565b9efce7 files/0.10.0/series 15
+RMD160 acec575672f0029f32570ca112b6808f956dcd5e files/0.10.0/series 15
+SHA256 bc0656e593953f8aa18060c652e0c4bc795471daf8af5fde6f2c5543011d7bbd files/0.10.0/series 15
 AUX 0.9.15/01_gentoo.diff 1438 RMD160 634b6627ce8c437758472992c0f995bd35576e98 SHA1 e6999c59d0fd15cf6b1cec21427d6175e3ae4bf5 SHA256 2156e6c21feb8d77b3748d51046b97aed1941ded9843dc01443ccac70606c710
 MD5 53554879c1cabab357ea7eae85667ca6 files/0.9.15/01_gentoo.diff 1438
 RMD160 634b6627ce8c437758472992c0f995bd35576e98 files/0.9.15/01_gentoo.diff 1438
@@ -45,8 +53,13 @@ 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
+DIST vdr-mp3-0.10.0.tar.gz 124424 RMD160 21fb27b5097ce3345e5895f72e2639ec2aceaa8b SHA1 f535144268fdad07e41914ac34e160566618b87e SHA256 2cfcbb9315cc0c23d9461978db6d01ad7d72854a24b2f06da796c7c3faea98b0
 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.10.0.ebuild 1364 RMD160 5b5ac2efa1a8e68a2011f40a1ff091f5a5dc9bae SHA1 49caff9d5a4fc628f345f4c3e8fdda9190508cf1 SHA256 0118035b9ade8d0f20e1072730a476b9af9b5ae3d37ef1077d65fc5bf9ed5f16
+MD5 c62d315ebf2cd835465010096c39c4e7 vdr-mplayer-0.10.0.ebuild 1364
+RMD160 5b5ac2efa1a8e68a2011f40a1ff091f5a5dc9bae vdr-mplayer-0.10.0.ebuild 1364
+SHA256 0118035b9ade8d0f20e1072730a476b9af9b5ae3d37ef1077d65fc5bf9ed5f16 vdr-mplayer-0.10.0.ebuild 1364
 EBUILD vdr-mplayer-0.9.14-r2.ebuild 1321 RMD160 b5634bda51902d61c20639994774fccac20c2c03 SHA1 cee14e682d1b310a0a9e6272303d4796bbbb4e04 SHA256 2f75b1ff3c033a2566e5fccf3f7718c111e8bcb559cd45a4d7425a4c6a675bfa
 MD5 4b886267b366232db161618a9bd35625 vdr-mplayer-0.9.14-r2.ebuild 1321
 RMD160 b5634bda51902d61c20639994774fccac20c2c03 vdr-mplayer-0.9.14-r2.ebuild 1321
@@ -59,14 +72,17 @@ EBUILD vdr-mplayer-0.9.15.ebuild 1328 RMD160 bc5217ecd8df90bdf2604e0d2acbb998e00
 MD5 b8f6e9254a8e4e7ecc46ce9d82c13c57 vdr-mplayer-0.9.15.ebuild 1328
 RMD160 bc5217ecd8df90bdf2604e0d2acbb998e006b1f9 vdr-mplayer-0.9.15.ebuild 1328
 SHA256 4669ba0e129351010c91bd0ccb52ff1d83ef20f9f64555bf6cec8901739017d9 vdr-mplayer-0.9.15.ebuild 1328
-MISC ChangeLog 3491 RMD160 5d1b058ab83eeb371bbecf862683c9cec4bbe3f2 SHA1 25a9077234c855af438b3a209f99bf38f0da0c50 SHA256 a3e015bf3434aba1917ff8f726b67057548924c4e8b75393d29a22f52c6f41bb
-MD5 c23dfe8208155b8292202d6bea08e0e1 ChangeLog 3491
-RMD160 5d1b058ab83eeb371bbecf862683c9cec4bbe3f2 ChangeLog 3491
-SHA256 a3e015bf3434aba1917ff8f726b67057548924c4e8b75393d29a22f52c6f41bb ChangeLog 3491
+MISC ChangeLog 3682 RMD160 3efb2ba64f244892e4d8480500ed0c12b642305f SHA1 fba2aa4026a39da5f55dc2452c0b1f2d81435761 SHA256 5c1c703aa723c16c80871986b120c523662e86cd38c4aefe3b07a410ab5ff5bd
+MD5 c3d691f0b6418939f60d073a70cc4b32 ChangeLog 3682
+RMD160 3efb2ba64f244892e4d8480500ed0c12b642305f ChangeLog 3682
+SHA256 5c1c703aa723c16c80871986b120c523662e86cd38c4aefe3b07a410ab5ff5bd ChangeLog 3682
 MISC metadata.xml 508 RMD160 673fd3703f2cea3b06b7a741ff4c3b7ee3659ee7 SHA1 2d2c2995418dce644b10b4e279be89b6aafd4469 SHA256 f318bda3bdd3594206fe0e0c2f92c0e726a3c43762450dc36d5623fa05f17faa
 MD5 5c13143cd80eb7d5ef43443d1e6cde83 metadata.xml 508
 RMD160 673fd3703f2cea3b06b7a741ff4c3b7ee3659ee7 metadata.xml 508
 SHA256 f318bda3bdd3594206fe0e0c2f92c0e726a3c43762450dc36d5623fa05f17faa metadata.xml 508
+MD5 252d720912f8ca09b2ce6f0219e58901 files/digest-vdr-mplayer-0.10.0 244
+RMD160 3ee9126ab262e80512119cac57a7f2e2ae285173 files/digest-vdr-mplayer-0.10.0 244
+SHA256 deff76b5c221e5e9f9fa720346601127d6bdcdc780647787f0deea42f10f2b74 files/digest-vdr-mplayer-0.10.0 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
@@ -79,7 +95,7 @@ SHA256 2915e679e7d4945c1375124ea5db869bfb79f83077e6c2782e14dba31fd080c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGc6Umt2vP6XvVdOcRAhP0AKCEVDEZ7lzdis3eCJT0mh1MXcYIOACgnN8R
-h3BMjdQShfYdJprO/N0qKog=
-=Hy3Q
+iD8DBQFGdSlnt2vP6XvVdOcRAvgQAJ0SZE+cgMbObKcQVPkSL3UDSxO5NgCgot7l
+M7jpP4YsnHuzYD/3OgQ5HFM=
+=Oo9n
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9e82ab14dab5
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..65a3f0ae0891
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/0.10.0/series
@@ -0,0 +1 @@
+01_gentoo.diff
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.10.0 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.10.0
new file mode 100644
index 000000000000..34abc5c9c609
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.10.0
@@ -0,0 +1,3 @@
+MD5 59163664e1a35c5554df13e46c84948c vdr-mp3-0.10.0.tar.gz 124424
+RMD160 21fb27b5097ce3345e5895f72e2639ec2aceaa8b vdr-mp3-0.10.0.tar.gz 124424
+SHA256 2cfcbb9315cc0c23d9461978db6d01ad7d72854a24b2f06da796c7c3faea98b0 vdr-mp3-0.10.0.tar.gz 124424
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild
new file mode 100644
index 000000000000..ae4ce80608b0
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.0.ebuild
@@ -0,0 +1,56 @@
+# 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.10.0.ebuild,v 1.1 2007/06/17 12:30:18 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"
+
+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
+}