Added patch to fix continuing from resume-position.

Package-Manager: portage-2.1.1_pre1-r1

6 files changed, 118 insertions, 14 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index fbf01d088e6e..3374d1402184 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2006/04/17 17:13:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.3 2006/06/18 21:38:35 zzam Exp $
+
+*vdr-mplayer-0.9.14-r1 (18 Jun 2006)
+
+  18 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-mplayer-0.9.14-resume.diff, +vdr-mplayer-0.9.14-r1.ebuild:
+  Added patch to fix continuing from resume-position.
 
   17 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.9.14.ebuild:
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest
index c3ab9ba6fc19..e384862bf764 100644
--- a/media-plugins/vdr-mplayer/Manifest
+++ b/media-plugins/vdr-mplayer/Manifest
@@ -1,31 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0b98a831345b70eec865b59dda02e944 ChangeLog 630
-RMD160 d1c68d75da4ab4f3a14e79260e40634334b14e9d ChangeLog 630
-SHA256 c2527c41e93bd6e772d86a4710c2ef0ad0b6b1dfb5e6363088b8a536a84c80b2 ChangeLog 630
-MD5 b7de4186db3fbb5635de8bb610ac00f3 files/digest-vdr-mplayer-0.9.14 66
-RMD160 4ac593dde65d225393d371df073661703fb97657 files/digest-vdr-mplayer-0.9.14 66
-SHA256 10d076e56dfac454babe0f1e72cf7b07125aeb27b222481c353cf816ad338294 files/digest-vdr-mplayer-0.9.14 66
+AUX mplayersources.conf 40 RMD160 61d3691f404fbb9fbd4f70f69821f347ba64b50b SHA1 70b302df9315976174f9eb7d07ba95edc64152a5 SHA256 126740b54a73fdfa851847fdb2c1f7c0bcbebac431189af7617f53d56119c3f2
 MD5 955192f29c395d3439388eaf3982ce11 files/mplayersources.conf 40
 RMD160 61d3691f404fbb9fbd4f70f69821f347ba64b50b files/mplayersources.conf 40
 SHA256 126740b54a73fdfa851847fdb2c1f7c0bcbebac431189af7617f53d56119c3f2 files/mplayersources.conf 40
+AUX rc-addon.sh 529 RMD160 8b813dd562443717dacb3d8a603efcd594e6834e SHA1 d0737f8e7b33cb30830654b53d5b53d1c6d51d28 SHA256 5342705f9b914a3674ef5841311bf33c7d04371ff51a0e4553afa2e0f2228d92
 MD5 6ea7c41051b0cc0288353a2f6a4efcd1 files/rc-addon.sh 529
 RMD160 8b813dd562443717dacb3d8a603efcd594e6834e files/rc-addon.sh 529
 SHA256 5342705f9b914a3674ef5841311bf33c7d04371ff51a0e4553afa2e0f2228d92 files/rc-addon.sh 529
+AUX vdr-mplayer-0.9.14-gentoo.diff 1190 RMD160 a2f7ef7d7047409516019dd393123207eb766a76 SHA1 c12b644ee76d27a49d4ca04e7ba1c604f41e096a SHA256 878cf7f8a1430e09e1293a1187bd16ac09c5ee50d94acc1ad1e0d90f7526d50e
 MD5 2c64b25f82c7f467d26efa6787530258 files/vdr-mplayer-0.9.14-gentoo.diff 1190
 RMD160 a2f7ef7d7047409516019dd393123207eb766a76 files/vdr-mplayer-0.9.14-gentoo.diff 1190
 SHA256 878cf7f8a1430e09e1293a1187bd16ac09c5ee50d94acc1ad1e0d90f7526d50e files/vdr-mplayer-0.9.14-gentoo.diff 1190
-MD5 bbe1275ce1f4cde2cb3d401105b029b1 metadata.xml 512
-RMD160 969a7e1b3885e90ebe6f1eb5cfcba3c3a520afa0 metadata.xml 512
-SHA256 9581dee17491aaa1dadf47977f627db5f25bea00341e21a087e7dae1490775b0 metadata.xml 512
+AUX vdr-mplayer-0.9.14-resume.diff 1074 RMD160 d453c674c377d0afb1a749cdba4c43c711ddce65 SHA1 1468e1017960b96e8e0be44c7c02edfc3978c8ea SHA256 7bdfb3d47900289df4d5caf68f5bf1ce1b97cc69d204c541a1f1491be62e3f27
+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
+DIST vdr-mp3-0.9.14.tar.gz 120589 RMD160 df380f13a7a50d4e400aaed875cb7dddbc42e270 SHA1 a62511b8d8ccaba0569bb8b7a7ee6e110575b987 SHA256 c5f38e79364d7832626b907ac3316da143813b568c223d32f5005d1ed732501a
+EBUILD vdr-mplayer-0.9.14-r1.ebuild 1256 RMD160 fd57864f24f003d1f3586de2c4ba1f2182e54f2a SHA1 bf250408b772d01f06ffee931735f0835dd3e5f2 SHA256 c471dd9e65297d1e4b638e96b399b7f8c95dcdfc66a061038e8ab919dec05c03
+MD5 636f48c1350ebee8584ba3caa6e58fa5 vdr-mplayer-0.9.14-r1.ebuild 1256
+RMD160 fd57864f24f003d1f3586de2c4ba1f2182e54f2a vdr-mplayer-0.9.14-r1.ebuild 1256
+SHA256 c471dd9e65297d1e4b638e96b399b7f8c95dcdfc66a061038e8ab919dec05c03 vdr-mplayer-0.9.14-r1.ebuild 1256
+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 848 RMD160 24df526e8cf6abdfb8a0315fda0fd3a654bb1ae5 SHA1 c9491155316abb63ce1e1b69ae6f67cd7996f09f SHA256 e0da835482f7d0ff9607f11f713d892cf2bb66211e383e9cba67c37b5c732d74
+MD5 245966315a25321276d52c67841b4055 ChangeLog 848
+RMD160 24df526e8cf6abdfb8a0315fda0fd3a654bb1ae5 ChangeLog 848
+SHA256 e0da835482f7d0ff9607f11f713d892cf2bb66211e383e9cba67c37b5c732d74 ChangeLog 848
+MISC metadata.xml 512 RMD160 969a7e1b3885e90ebe6f1eb5cfcba3c3a520afa0 SHA1 3c74689eddeb2f119b858d8cb600dea24313b664 SHA256 9581dee17491aaa1dadf47977f627db5f25bea00341e21a087e7dae1490775b0
+MD5 bbe1275ce1f4cde2cb3d401105b029b1 metadata.xml 512
+RMD160 969a7e1b3885e90ebe6f1eb5cfcba3c3a520afa0 metadata.xml 512
+SHA256 9581dee17491aaa1dadf47977f627db5f25bea00341e21a087e7dae1490775b0 metadata.xml 512
+MD5 c4abfc5f014cd1c1896db8cc03ddb0fa files/digest-vdr-mplayer-0.9.14 244
+RMD160 9666dc23e40c4cb1381db2724f779b8a6c24f37a files/digest-vdr-mplayer-0.9.14 244
+SHA256 3274c19a85d19ac42ca69da7b36f3dea0f0d22d5e60aa7a73b4bf26d458b80e3 files/digest-vdr-mplayer-0.9.14 244
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEQ80hZfSl1Kp5KmoRArTkAJ9k2x2B7ABfE8R5Eaja9owTNo6ORgCdEuQO
-Ley9C92CrDwtwwRGeVz8FkQ=
-=VrzU
+iD8DBQFElcfnZfSl1Kp5KmoRAldzAKCv4PxhKrcDUtew0uuW682fY2HDwQCeJ/EG
+Lz5gnfN/6Nj/DxKj/y3ke2g=
+=3hPe
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14
index 9e41a9c639e6..b1d2c6f76349 100644
--- a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14
@@ -1 +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/digest-vdr-mplayer-0.9.14-r1 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14-r1
new file mode 100644
index 000000000000..b1d2c6f76349
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.14-r1
@@ -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-resume.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-resume.diff
new file mode 100644
index 000000000000..f5184fc4636b
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.14-resume.diff
@@ -0,0 +1,22 @@
+Patch from http://www.vdr-portal.de/board/thread.php?postid=411371#post411371
+
+diff -u mp3-0.9.14-orig/player-mplayer.c mp3-0.9.14/player-mplayer.c
+--- mp3-0.9.14-orig/player-mplayer.c	2006-06-18 23:29:35.696587731 +0200
++++ mp3-0.9.14/player-mplayer.c	2006-06-18 23:33:09.501196623 +0200
+@@ -465,7 +465,7 @@
+               nextTime=nextPos=0;
+               d(printf("PLAYBACK STARTED\n"))
+               if(resPos>=0.0) {
+-                if(!currentName || !strcmp(currentName,file->Path()))
++                if(!currentName || !strcmp(currentName,file->FullPath()))
+                   MPlayerControl("seek %.1f 1",resPos);
+                 else
+                   d(printf("mplayer: no resume, seems to be playlist\n"))
+@@ -480,6 +480,7 @@
+             LOCK_THREAD;
+             free(currentName);
+             currentName=strdup(::index(buff,' ')+1);
++            if(currentName[0]) currentName[strlen(currentName)-1]=0; // skip trailing dot
+             d(printf("PLAYING %s\n",currentName))
+             }
+           else if(sscanf(buff,"ANS_LENGTH=%d",&itime)==1) {
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r1.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r1.ebuild
new file mode 100644
index 000000000000..e696983cd508
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.14-r1.ebuild
@@ -0,0 +1,53 @@
+# 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-r1.ebuild,v 1.1 2006/06/18 21:38:35 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=">=media-video/mplayer-0.90_rc4
+		>=media-video/mplayer-sh-0.8.6-r1"
+
+S=${WORKDIR}/mp3-${PV}
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+		${FILESDIR}/${P}-resume.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
+}