Added some patch from erm67 to solve problems with newer mplayer-versions, Bug #150217.

Package-Manager: portage-2.1.2_rc1-r4

5 files changed, 150 insertions, 9 deletions

diff --git a/media-plugins/vdr-vdrrip/ChangeLog b/media-plugins/vdr-vdrrip/ChangeLog
index 0236b9b7df89..d8c3ec9e1b21 100644
--- a/media-plugins/vdr-vdrrip/ChangeLog
+++ b/media-plugins/vdr-vdrrip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-vdrrip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/ChangeLog,v 1.2 2006/10/13 21:36:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/ChangeLog,v 1.3 2006/11/06 10:05:04 zzam Exp $
+
+*vdr-vdrrip-0.3.0-r5 (06 Nov 2006)
+
+  06 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-vdrrip-0.3.0-mplayercmd2.diff, +vdr-vdrrip-0.3.0-r5.ebuild:
+  Added some patch from erm67 to solve problems with newer mplayer-versions,
+  Bug #150217.
 
   13 Oct 2006; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdrrip-qh,
   files/vdrrip-qh.conf:
diff --git a/media-plugins/vdr-vdrrip/Manifest b/media-plugins/vdr-vdrrip/Manifest
index b9fa370808b7..b1b92356a753 100644
--- a/media-plugins/vdr-vdrrip/Manifest
+++ b/media-plugins/vdr-vdrrip/Manifest
@@ -41,6 +41,10 @@ AUX rc-addon.sh 340 RMD160 efe1ad0eea1fee1d10e6e70f67799165e85b9d10 SHA1 99f2a92
 MD5 ba0e51e2c70e2116c38fcdb071ddd357 files/rc-addon.sh 340
 RMD160 efe1ad0eea1fee1d10e6e70f67799165e85b9d10 files/rc-addon.sh 340
 SHA256 b209266a71e987af38779c8f52c4e0e96398c0fa860654e42d590b1f69fad39f files/rc-addon.sh 340
+AUX vdr-vdrrip-0.3.0-mplayercmd2.diff 1467 RMD160 45777b382e9cf313b577d67a8d4c3e6f9a8a88a1 SHA1 698d829441c0a0287d86fba18abb1dce53dfe581 SHA256 18bb71b9a14f8a5307d2256f0f60e78fe335216648c145add0278192e4b15ce3
+MD5 e0ed857d2b681bc226be21ae785eace7 files/vdr-vdrrip-0.3.0-mplayercmd2.diff 1467
+RMD160 45777b382e9cf313b577d67a8d4c3e6f9a8a88a1 files/vdr-vdrrip-0.3.0-mplayercmd2.diff 1467
+SHA256 18bb71b9a14f8a5307d2256f0f60e78fe335216648c145add0278192e4b15ce3 files/vdr-vdrrip-0.3.0-mplayercmd2.diff 1467
 AUX vdrrip-0.3.0-1.3.7.diff 7957 RMD160 d7f597442b2b3d12af640db54650979bf7db1872 SHA1 ac53f4b4cfd8168b9352c72b36a337d9549eca3a SHA256 609d3cb24efa5d310c0aecc90f25b2be58a9e3061ddd035acbcfef4190095f99
 MD5 bcbc46e17d0abd4034405717c9806615 files/vdrrip-0.3.0-1.3.7.diff 7957
 RMD160 d7f597442b2b3d12af640db54650979bf7db1872 files/vdrrip-0.3.0-1.3.7.diff 7957
@@ -59,10 +63,14 @@ EBUILD vdr-vdrrip-0.3.0-r4.ebuild 2594 RMD160 01d424351a752977bc40757b2900172f0d
 MD5 e359b06a8bd445199f28af20f27976ec vdr-vdrrip-0.3.0-r4.ebuild 2594
 RMD160 01d424351a752977bc40757b2900172f0d98dcdf vdr-vdrrip-0.3.0-r4.ebuild 2594
 SHA256 eee50c76eb315609782d689e7de73545ce1c927767a24ab68d20c0952b7160b6 vdr-vdrrip-0.3.0-r4.ebuild 2594
-MISC ChangeLog 951 RMD160 4267083e17bb94a2cd89f74b4b89b22433f7b6b5 SHA1 ce2f80ebb2f62e0b221eac8c9d22732c24092750 SHA256 ba18b64a916987e288a54f09980802bbdea0d709c93d67571f5deea52e27de1d
-MD5 4ecfa795f706fb0e158d66dd9928a85f ChangeLog 951
-RMD160 4267083e17bb94a2cd89f74b4b89b22433f7b6b5 ChangeLog 951
-SHA256 ba18b64a916987e288a54f09980802bbdea0d709c93d67571f5deea52e27de1d ChangeLog 951
+EBUILD vdr-vdrrip-0.3.0-r5.ebuild 2612 RMD160 25a92c9a26cf116f9a669def3ae4b712b6519e13 SHA1 38f8dfc9de04b1e50af620fd896101f3ac7e4999 SHA256 89cc0f7242ffb51ee216c6a44b38e6a9ce1b1f414ba541fcda77c4010962e4f4
+MD5 db7db387b1bf1d2898b58b872ef423d7 vdr-vdrrip-0.3.0-r5.ebuild 2612
+RMD160 25a92c9a26cf116f9a669def3ae4b712b6519e13 vdr-vdrrip-0.3.0-r5.ebuild 2612
+SHA256 89cc0f7242ffb51ee216c6a44b38e6a9ce1b1f414ba541fcda77c4010962e4f4 vdr-vdrrip-0.3.0-r5.ebuild 2612
+MISC ChangeLog 1201 RMD160 dd905904779a314445a1cf60519ba9f99a018209 SHA1 8d82448fa12348303e73e488d744b364b60cdc97 SHA256 a6b516ca88855e5ac0b9f4724c5c3d026c63038b44178ad0b0dcfd349163adf4
+MD5 76f955d311ad29e7c512da93a6ed578f ChangeLog 1201
+RMD160 dd905904779a314445a1cf60519ba9f99a018209 ChangeLog 1201
+SHA256 a6b516ca88855e5ac0b9f4724c5c3d026c63038b44178ad0b0dcfd349163adf4 ChangeLog 1201
 MISC metadata.xml 381 RMD160 0e3b0b21452d7c20ff180ccfc0b5b95d5b52beef SHA1 32e7107b506f8c6cced9c0f99fb1f7234de78a0a SHA256 6bfc8b347b55b3649ce9573dd95c74e702d4f1bf255debd4643551939873dcfc
 MD5 d9a53b2460c0ab8df1f0b328d069c929 metadata.xml 381
 RMD160 0e3b0b21452d7c20ff180ccfc0b5b95d5b52beef metadata.xml 381
@@ -70,11 +78,13 @@ SHA256 6bfc8b347b55b3649ce9573dd95c74e702d4f1bf255debd4643551939873dcfc metadata
 MD5 29e30deb53518ad6a72fcb1d5d750dc2 files/digest-vdr-vdrrip-0.3.0-r4 497
 RMD160 ac1f1477d7d541c4000c49d3ea9b126644cf7841 files/digest-vdr-vdrrip-0.3.0-r4 497
 SHA256 b6c3e5bd3d61811aecf68aba9ed25725576d65b5e596a4936e422f357b5ba53f files/digest-vdr-vdrrip-0.3.0-r4 497
+MD5 29e30deb53518ad6a72fcb1d5d750dc2 files/digest-vdr-vdrrip-0.3.0-r5 497
+RMD160 ac1f1477d7d541c4000c49d3ea9b126644cf7841 files/digest-vdr-vdrrip-0.3.0-r5 497
+SHA256 b6c3e5bd3d61811aecf68aba9ed25725576d65b5e596a4936e422f357b5ba53f files/digest-vdr-vdrrip-0.3.0-r5 497
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: no further Information
 
-iD8DBQFFMAeLdn07HTTCgIoRArekAKCMXCMx1fBblfszxnUaxlKYoHZUFgCeK7LC
-sKhX03awvegORh5gamYXkkU=
-=RSYb
+iD8DBQFFTwjbt2vP6XvVdOcRAlwEAJ4nj2lFmUkQMMJgGHAq0yNy8UZSEQCdFySy
+Szdsnc6iXzvKF9CBhrj5mp0=
+=2IrD
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5 b/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5
new file mode 100644
index 000000000000..a8ba5765ee75
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r5
@@ -0,0 +1,6 @@
+MD5 3c5363fd3017458b566e3503ccfaea2c queuehandler-fixed-0.3.0.sh 25777
+RMD160 4e8928b884205556e9d2bbe1b29c9b0ad4029b88 queuehandler-fixed-0.3.0.sh 25777
+SHA256 b6c9729de47ce0ebafdfa8ae8dc2022adc292718d37f79d8569f13d865b25d5f queuehandler-fixed-0.3.0.sh 25777
+MD5 7ba3581d26b3ffc2ebfc400f95bf72fd vdr-vdrrip-0.3.0.tgz 94937
+RMD160 9a3d418e715e3fbcf5d010a21c671b13fd269b99 vdr-vdrrip-0.3.0.tgz 94937
+SHA256 9fda896cacbb78b2139ae6baa53f08a992768a78d0dce33b836b0c2ae797702b vdr-vdrrip-0.3.0.tgz 94937
diff --git a/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff
new file mode 100644
index 000000000000..92dd656a1711
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/files/vdr-vdrrip-0.3.0-mplayercmd2.diff
@@ -0,0 +1,32 @@
+diff -r -u vdrrip-0.3.0.org/movie.c vdrrip-0.3.0/movie.c
+--- vdrrip-0.3.0.org/movie.c	2006-11-06 00:06:29.000000000 +0100
++++ vdrrip-0.3.0/movie.c	2006-11-06 00:04:35.000000000 +0100
+@@ -21,8 +21,8 @@
+ 
+ #define SAVEFILE "save.vdrrip"
+ 
+-#define IDENTCMD "%s \'%s\'%s -identify -frames 0 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
+-#define CROPCMD "%s \'%s\'%s -vo null -ao null -really-quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
++#define IDENTCMD "%s \'%s\'%s -identify -vo null -ao null -frames 1 2>/dev/null | sed -e \'s/[`\\!$\"]/\\&/g\'"
++#define CROPCMD "%s \'%s\'%s -vo null -ao null -quiet -ss %i -frames %i -vop cropdetect 2>/dev/null | grep \"crop=\" | sed \"s/.*crop\\(.*\\)).*/\\1/\" | sort | uniq -c | sort -r"
+ #define AUDIOCMD "%s \'%s/001.vdr\' -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
+ #define AUDIOCMDDVD "%s %s -vo null -ao null -frames 0 -aid %i 2>/dev/null | grep AUDIO"
+ #define MENCCMD "%s %s help 2>/dev/null"
+@@ -515,11 +515,12 @@
+     } else {Fps = -1;}
+     FREE(s);
+ 
+-    s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2);
+-    if (s) {
+-      Aspect = atof(s);
+-    } else {Aspect = -1;}
+-
++    Aspect = -1;
++    while(s = strcol(strgrep("ID_VIDEO_ASPECT", p), "=", 2)){
++       Aspect = atof(s);
++       if (Aspect != 0) break;
++    }   
++    if (Aspect == 0) {Aspect = 1.333333;}
+     CalcAspect = Aspect;
+ 
+     pclose(p);
diff --git a/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r5.ebuild b/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r5.ebuild
new file mode 100644
index 000000000000..bef172d96937
--- /dev/null
+++ b/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r5.ebuild,v 1.1 2006/11/06 10:05:04 zzam Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: convert video-recordings to mpeg4 for burning on CDs"
+HOMEPAGE="http://www.a-land.de/"
+SRC_URI="http://www.a-land.de/${P}.tgz
+		http://www.a-land.de/queuehandler-fixed-0.3.0.sh"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.0"
+RDEPEND="${DEPEND}
+		>=media-video/mplayer-1.0_pre8
+		sys-process/procps
+		sys-apps/util-linux"
+# media-video/vdrsync seems to be optional
+
+src_unpack() {
+	vdr-plugin_src_unpack
+	cp ${DISTDIR}/queuehandler-fixed-0.3.0.sh ${S}/scripts/queuehandler.sh
+
+	if
+	has_version ">=media-video/vdr-1.3.7" ;
+	then
+		einfo "applying VDR > 1.3.6 patch"
+		epatch ${FILESDIR}/vdrrip-0.3.0-1.3.7.diff
+		epatch ${FILESDIR}/maketempdir.diff
+		epatch ${FILESDIR}/greppid2.diff
+		epatch ${FILESDIR}/detectlength.diff
+		epatch ${FILESDIR}/fix-ogm-ac3-vdrsync-dev.diff
+		epatch ${FILESDIR}/fixpreview.diff
+		epatch ${FILESDIR}/mencoderparam.diff
+		epatch ${FILESDIR}/preserve-queue-owner.diff
+		epatch ${FILESDIR}/log-patch.diff
+		epatch ${FILESDIR}/vdr-vdrrip-0.3.0-mplayercmd2.diff
+	fi
+
+	einfo "Patching queuehandler.sh.conf for gentoo-needs..."
+	cd ${S}
+	sed -e "s,/usr/local/bin/,/usr/bin/," \
+		-e 's,/usr/bin/mencoder_ac3,/usr/bin/mencoder,' \
+		-e 's,/usr/bin/mplayer_ac3,/usr/bin/mplayer,' \
+		-i scripts/queuehandler.sh.conf
+
+	sed -e 's,scriptdir=`dirname $0`,scriptdir=/etc/vdr/plugins/vdrrip,' \
+		-e 's,nice -+19,nice -n 19,' \
+		-i scripts/queuehandler.sh
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	# save config files
+	insinto /etc/vdr/plugins/vdrrip
+	newins scripts/queuehandler.sh.conf vdrrip-qh.conf
+	newconfd ${FILESDIR}/vdrrip-qh.conf vdrrip-qh
+	# add start script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/vdrrip-qh
+	# save in bin
+	newbin scripts/queuehandler.sh vdrrip-qh
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	einfo "You should have a look at this files:"
+	einfo
+	einfo "* /etc/vdr/plugins/vdrrip/vdrrip-qh.conf"
+	einfo
+	einfo "Use vdrrip-qh to start the vdrrip queue handler."
+	einfo "You can also run 'rc-update add /etc/init.d/vdrrip-qh default' to"
+	einfo "let vdrrip-qh start automaticly when the system starts."
+
+	einfo
+	einfo "If you used vdrrip before, mind that it runs by default as user vdr now."
+	einfo "To correct the permissions you should execute this:"
+	einfo "# chown vdr:vdr -R /var/log/vdrrip-qh /tmp/vdrrip /tmp/queuehandler.vdr"
+	einfo
+}