Added patch to fix continuing from resume-position.

(Portage version: 2.1.1_pre1-r1)

5 files changed, 87 insertions, 1 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/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
+}