Corrected bash syntax in patch, thanks to erm67, Bug #159496.
authorMatthias Schwarzott <zzam@gentoo.org>
Wed, 3 Jan 2007 11:20:40 +0000 (11:20 +0000)
committerMatthias Schwarzott <zzam@gentoo.org>
Wed, 3 Jan 2007 11:20:40 +0000 (11:20 +0000)
Package-Manager: portage-2.1.2_rc4-r5

media-plugins/vdr-vdrrip/ChangeLog
media-plugins/vdr-vdrrip/Manifest
media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r6 [new file with mode: 0644]
media-plugins/vdr-vdrrip/files/mencoderparam-2.diff [new file with mode: 0644]
media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r6.ebuild [new file with mode: 0644]

index d8c3ec9e1b21c5bcf5905333e23ec011c618ad06..d09302bf21048d920144475cc71915d37a0ae1d4 100644 (file)
@@ -1,6 +1,12 @@
 # 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.3 2006/11/06 10:05:04 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrrip/ChangeLog,v 1.4 2007/01/03 11:20:40 zzam Exp $
+
+*vdr-vdrrip-0.3.0-r6 (03 Jan 2007)
+
+  03 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mencoderparam-2.diff, +vdr-vdrrip-0.3.0-r6.ebuild:
+  Corrected bash syntax in patch, thanks to erm67, Bug #159496.
 
 *vdr-vdrrip-0.3.0-r5 (06 Nov 2006)
 
index b1b92356a7535b02d9e4f7097d4eb4bef917f707..ef9267f0010d2dfef666ec5d0eb5dbd2d5ecf15c 100644 (file)
@@ -25,6 +25,10 @@ AUX maketempdir.diff 771 RMD160 9b8a2e4ec73e366be877c24fb1f14690d369ff06 SHA1 6e
 MD5 2cedc1d7e410512fda8b0a892d341ee1 files/maketempdir.diff 771
 RMD160 9b8a2e4ec73e366be877c24fb1f14690d369ff06 files/maketempdir.diff 771
 SHA256 ab90d54d188a0256a9c1c491b9e386b6b63664bdceae8fe7a5696baccd9777dd files/maketempdir.diff 771
+AUX mencoderparam-2.diff 2764 RMD160 c07e255c270fac8519935921866bc790176d6244 SHA1 c21f018c32e6beee636d3c1f9134ef64c52ff100 SHA256 3f35feda5639370d407fd251f163c0537829eabb327a10f2e1153855d5e07e7f
+MD5 df461ddb68da1f87221401215f338b55 files/mencoderparam-2.diff 2764
+RMD160 c07e255c270fac8519935921866bc790176d6244 files/mencoderparam-2.diff 2764
+SHA256 3f35feda5639370d407fd251f163c0537829eabb327a10f2e1153855d5e07e7f files/mencoderparam-2.diff 2764
 AUX mencoderparam.diff 2775 RMD160 c09d964d37abdffb2158d1fa5bba10132a4ba3db SHA1 4a5f85f1a670f4ae747443fda13d0d26a77f162f SHA256 e30d800c74b0d4ced0c5a370391c32728035170e5c294ce086ffe0385de5f38d
 MD5 daa066ec430a4b4512cf2623572d12bd files/mencoderparam.diff 2775
 RMD160 c09d964d37abdffb2158d1fa5bba10132a4ba3db files/mencoderparam.diff 2775
@@ -67,10 +71,14 @@ EBUILD vdr-vdrrip-0.3.0-r5.ebuild 2612 RMD160 25a92c9a26cf116f9a669def3ae4b712b6
 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
+EBUILD vdr-vdrrip-0.3.0-r6.ebuild 2614 RMD160 8eea9e0b1101d0e0d424fe3e9e2ea90e24be62ce SHA1 b461990c69eab38c9bf40fbb98cd30a877918697 SHA256 51aa06565a512e2af1e50b5716fdef8a129a3f9ab5ed71aa087c72b29f8e06ee
+MD5 211be2268695b146d49a532017b473a1 vdr-vdrrip-0.3.0-r6.ebuild 2614
+RMD160 8eea9e0b1101d0e0d424fe3e9e2ea90e24be62ce vdr-vdrrip-0.3.0-r6.ebuild 2614
+SHA256 51aa06565a512e2af1e50b5716fdef8a129a3f9ab5ed71aa087c72b29f8e06ee vdr-vdrrip-0.3.0-r6.ebuild 2614
+MISC ChangeLog 1415 RMD160 e0e0b3a28a29021344233479f45fac2f5540d6d8 SHA1 f84139819d01ba64db7c64f8e153d12d775c581d SHA256 a48951f9d5fbb47ff605e3271768316d8f0e6ae22f542c1095c619cf65d78fae
+MD5 7dd577b92efc26a9786313e7d1d36736 ChangeLog 1415
+RMD160 e0e0b3a28a29021344233479f45fac2f5540d6d8 ChangeLog 1415
+SHA256 a48951f9d5fbb47ff605e3271768316d8f0e6ae22f542c1095c619cf65d78fae ChangeLog 1415
 MISC metadata.xml 381 RMD160 0e3b0b21452d7c20ff180ccfc0b5b95d5b52beef SHA1 32e7107b506f8c6cced9c0f99fb1f7234de78a0a SHA256 6bfc8b347b55b3649ce9573dd95c74e702d4f1bf255debd4643551939873dcfc
 MD5 d9a53b2460c0ab8df1f0b328d069c929 metadata.xml 381
 RMD160 0e3b0b21452d7c20ff180ccfc0b5b95d5b52beef metadata.xml 381
@@ -81,10 +89,13 @@ SHA256 b6c3e5bd3d61811aecf68aba9ed25725576d65b5e596a4936e422f357b5ba53f files/di
 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
+MD5 29e30deb53518ad6a72fcb1d5d750dc2 files/digest-vdr-vdrrip-0.3.0-r6 497
+RMD160 ac1f1477d7d541c4000c49d3ea9b126644cf7841 files/digest-vdr-vdrrip-0.3.0-r6 497
+SHA256 b6c3e5bd3d61811aecf68aba9ed25725576d65b5e596a4936e422f357b5ba53f files/digest-vdr-vdrrip-0.3.0-r6 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFTwjbt2vP6XvVdOcRAlwEAJ4nj2lFmUkQMMJgGHAq0yNy8UZSEQCdFySy
-Szdsnc6iXzvKF9CBhrj5mp0=
-=2IrD
+iD8DBQFFm5GTt2vP6XvVdOcRAhC3AJ9Mkme+tJhyc86kSA05gARXHxOZRgCggs+P
+0OdpVvFQ42Hh3zYnfxtcsGs=
+=/M5U
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r6 b/media-plugins/vdr-vdrrip/files/digest-vdr-vdrrip-0.3.0-r6
new file mode 100644 (file)
index 0000000..a8ba576
--- /dev/null
@@ -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/mencoderparam-2.diff b/media-plugins/vdr-vdrrip/files/mencoderparam-2.diff
new file mode 100644 (file)
index 0000000..e1bc11c
--- /dev/null
@@ -0,0 +1,67 @@
+diff -r -u vdrrip-0.3.0/scripts/queuehandler.sh vdrrip-0.3.0.gentoo/scripts/queuehandler.sh
+--- vdrrip-0.3.0/scripts/queuehandler.sh       2006-10-06 18:25:15.000000000 +0200
++++ vdrrip-0.3.0.gentoo/scripts/queuehandler.sh        2006-10-06 18:54:32.000000000 +0200
+@@ -481,26 +481,40 @@
+     local vopopts="-vop $vopopts"
+   fi
++  if [ "$ppvalues" -a "${ppvalues:1:2}" != "hb" ]
++     then
++     local mintopts=""
++     local xintopts=""
++  else
++     local mintopts=":ildct:ilme"
++     local xintopts=":interlacing"
++  fi
++
+   # encode in two passes 
+   for pass in 1 2
+   do
+     if [ "$pass" = "1" ]
+     then
+       local ofile="-o /dev/null"
++      local mturbo=":turbo"
++      local xturbo=":turbo"
+     else
+       local ofile="-o $tempdir/$name.avi"
++    if [ "$useropts_lavc" ]; then log_info "\$useropts_lavc are set to \"$useropts_lavc\""; fi
++    if [ "$useropts_xvid" ]; then log_info "\$useropts_xvid are set to \"$useropts_xvid\""; fi
++    if [ "$mintopts" ]; then log_info "\Encoding an interlaced stream with \"$mintopts\""; fi
++    if [ "$xintopts" ]; then log_info "\Encoding an interlaced stream with \"$xintopts\""; fi
++      local mturbo=":$useropts_lavc$mintopts"
++      local xturbo=":$useropts_xvid$xintopts"
+     fi
+     # set mencoder video values
+     case "$vcodec" in
+       "lavc")
+-        local vopts="-ovc lavc -lavcopts vcodec=mpeg4:vhq:vbitrate=$br_video:vqmin=$min_q:vqmax=$max_q:vpass=$pass -sws 2"
++        local vopts="-ovc lavc -lavcopts vcodec=mpeg4:vhq:vbitrate=$br_video:vqmin=$min_q:vqmax=$max_q:vpass=$pass$mturbo -sws 2"
+         ;;
+       "xvid")
+-        local vopts="-ovc xvid -xvidencopts bitrate=$br_video:me_quality=6:pass=$pass -sws 2"
+-        ;;
+-      "divx4")
+-        local vopts="-ovc divx4 -divx4opts br=$br_video:q=5:min_quant=$min_q:max_quant=$max_q:pass=$pass -sws 2"
++        local vopts="-ovc xvid -xvidencopts bitrate=$br_video:me_quality=6:pass=$pass$xturbo -sws 2"
+         ;;
+       *)
+         log_error "unknown video codec $vcodec"
+diff -r -u vdrrip-0.3.0/scripts/queuehandler.sh.conf vdrrip-0.3.0.gentoo/scripts/queuehandler.sh.conf
+--- vdrrip-0.3.0/scripts/queuehandler.sh.conf  2004-04-22 20:54:11.000000000 +0200
++++ vdrrip-0.3.0.gentoo/scripts/queuehandler.sh.conf   2006-10-06 18:58:54.000000000 +0200
+@@ -69,3 +69,14 @@
+   vdrhostname="localhost"
++  # These are the options beside the bitrate and eventually the 
++  # interlace options passed to mencoder you can control the 
++  # quality of the encoding by changing them here
++
++  useropts_lavc=""
++  # For a high quality high bitrate encoding use:
++  #useropts_lavc="mbd=2:trell:cbp:mv0:cmp=3:subcmp=3"
++  useropts_xvid=""
++  # For a high quality high bitrate encoding use:
++  #useropts_xvid="me_quality=6:vhq=1:notrellis:max_bframes=2"
++
diff --git a/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r6.ebuild b/media-plugins/vdr-vdrrip/vdr-vdrrip-0.3.0-r6.ebuild
new file mode 100644 (file)
index 0000000..00b8091
--- /dev/null
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 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-r6.ebuild,v 1.1 2007/01/03 11:20:40 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-2.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
+}