From d8340cb1329f43cf9b815ef0a9ad9f8143c47577 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 28 Dec 2006 20:02:01 +0000 Subject: Now option to not run noad when there are already marks there. Cleaned up noad-wrapper-script a bit. (Portage version: 2.1.2_rc4-r1) --- media-video/noad/ChangeLog | 11 ++- .../noad/files/0.6.0-r7/confd_vdraddon.noad | 70 +++++++++++++++++ media-video/noad/files/0.6.0-r7/noad-reccmd | 7 ++ media-video/noad/files/0.6.0-r7/reccmds.noad.conf | 1 + media-video/noad/files/0.6.0-r7/record-50-noad.sh | 65 ++++++++++++++++ media-video/noad/files/digest-noad-0.6.0-r7 | 3 + media-video/noad/noad-0.6.0-r7.ebuild | 87 ++++++++++++++++++++++ 7 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 media-video/noad/files/0.6.0-r7/confd_vdraddon.noad create mode 100644 media-video/noad/files/0.6.0-r7/noad-reccmd create mode 100644 media-video/noad/files/0.6.0-r7/reccmds.noad.conf create mode 100644 media-video/noad/files/0.6.0-r7/record-50-noad.sh create mode 100644 media-video/noad/files/digest-noad-0.6.0-r7 create mode 100644 media-video/noad/noad-0.6.0-r7.ebuild (limited to 'media-video/noad') diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog index 9aabcab4f6ce..ce07944a9030 100644 --- a/media-video/noad/ChangeLog +++ b/media-video/noad/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/noad # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.14 2006/11/09 10:51:52 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.15 2006/12/28 20:02:01 zzam Exp $ + +*noad-0.6.0-r7 (28 Dec 2006) + + 28 Dec 2006; Matthias Schwarzott + +files/0.6.0-r7/record-50-noad.sh, +files/0.6.0-r7/confd_vdraddon.noad, + +files/0.6.0-r7/noad-reccmd, +files/0.6.0-r7/reccmds.noad.conf, + +noad-0.6.0-r7.ebuild: + Now option to not run noad when there are already marks there. Cleaned up + noad-wrapper-script a bit. 09 Nov 2006; Matthias Schwarzott noad-0.6.0-r4.ebuild, noad-0.6.0-r5.ebuild, noad-0.6.0-r6.ebuild: diff --git a/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad new file mode 100644 index 000000000000..6cb3d80d7719 --- /dev/null +++ b/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad @@ -0,0 +1,70 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad,v 1.1 2006/12/28 20:02:01 zzam Exp $ + +######### +## +# run Noad +# available Parameter +# no | yes +# +VDR_USE_NOAD="yes" + +## do online scan while recording +# you can choose between +# no - disable online scan +# live - scan only live recordings online (named @...) +# all - scan all recordings with online mode +# available Parameter +# no | live | all +# +NOAD_ONLINE="no" + +## start noad with nice +# available Parameter +# yes | no +NOAD_NICE="yes" + +## use ac3 detection +# available Parameter +# yes | no +# +NOAD_AC3="yes" + +## detect jumping logos +# available Parameter +# yes | no +# +NOAD_JUMP="yes" + +## detect overlaps +# available Parameter +# yes | no +# +NOAD_OVERLAP="yes" + +## send an OSD-Message to localhost:2001 for start and end +# available Parameter +# yes | no +# +NOAD_MESSAGES="yes" + +## only scan if sharemarks did not produce an ptsmarks.vdr file +# available Parameter +# yes | no +NOAD_ONLY_SCAN_IF_NO_PTSMARKS="yes" + +## only scan if there are no cut-marks already there (cutting while vdr still records) +# available Parameter +# yes | no +NOAD_ONLY_SCAN_IF_NO_MARKS="yes" + +## add your own parameter here, +# yust run 'noad' in konsole for more parameter +NOAD_PARAMETER="" + + + + + + diff --git a/media-video/noad/files/0.6.0-r7/noad-reccmd b/media-video/noad/files/0.6.0-r7/noad-reccmd new file mode 100644 index 000000000000..069a292f25cf --- /dev/null +++ b/media-video/noad/files/0.6.0-r7/noad-reccmd @@ -0,0 +1,7 @@ +#!/bin/bash + +VDR_RECORD_STATE=reccmd +VDR_RECORD_NAME="${1}" + +source /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" + diff --git a/media-video/noad/files/0.6.0-r7/reccmds.noad.conf b/media-video/noad/files/0.6.0-r7/reccmds.noad.conf new file mode 100644 index 000000000000..5d35495a90b8 --- /dev/null +++ b/media-video/noad/files/0.6.0-r7/reccmds.noad.conf @@ -0,0 +1 @@ +Scan for Commercials (noad) :/usr/share/vdr/bin/noad-reccmd diff --git a/media-video/noad/files/0.6.0-r7/record-50-noad.sh b/media-video/noad/files/0.6.0-r7/record-50-noad.sh new file mode 100644 index 000000000000..da1847ca31a5 --- /dev/null +++ b/media-video/noad/files/0.6.0-r7/record-50-noad.sh @@ -0,0 +1,65 @@ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r7/record-50-noad.sh,v 1.1 2006/12/28 20:02:01 zzam Exp $ +# +# Joerg Bornkessel +# Mathias Schwarzott +# + +source /etc/conf.d/vdraddon.noad + +CMD="/usr/bin/noad" + +# Parameter to start NoAd +# parameter are "no | yes" + +FORCE_OFFLINE_SCAN=no + +if [[ ${VDR_RECORD_STATE} == reccmd ]]; then + # script started from reccmd + FORCE_OFFLINE_SCAN=yes + VDR_RECORD_STATE=after +fi + + +if [[ ${FORCE_OFFLINE_SCAN} != yes ]]; then + # allow it to abort on certain conditions + + # automatic noad scan disabled + [[ ${VDR_USE_NOAD} == "yes" ]] || return + + # ptsmarks existing + if [[ ${NOAD_ONLY_SCAN_IF_NO_PTSMARKS} == yes ]]; then + [[ -f ${VDR_RECORD_NAME}/ptsmarks.vdr ]] && return + fi + + # marks existing + if [[ ${NOAD_ONLY_SCAN_IF_NO_MARKS} == yes ]]; then + [[ -f ${VDR_RECORD_NAME}/marks.vdr ]] && return + fi + + # Add Online-scanning parameter + case "${NOAD_ONLINE}" in + live|yes) + CMD="${CMD} --online=1" + ;; + all) + CMD="${CMD} --online=2" + ;; + no) + # abort stage "before" here + [[ ${VDR_RECORD_STATE} == "before" ]] && return + ;; + esac +fi + +[[ "${NOAD_AC3}" == "yes" ]] && CMD="${CMD} -a" +[[ "${NOAD_JUMP}" == "yes" ]] && CMD="${CMD} -j" +[[ "${NOAD_OVERLAP}" == "yes" ]] && CMD="${CMD} -o" +[[ "${NOAD_MESSAGES}" == "yes" ]] && CMD="${CMD} -O" + +if [[ ${NOAD_NICE} == yes ]]; then + CMD="nice ${CMD}" +fi + +CMD="${CMD} ${NOAD_PARAMETER}" +${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" + diff --git a/media-video/noad/files/digest-noad-0.6.0-r7 b/media-video/noad/files/digest-noad-0.6.0-r7 new file mode 100644 index 000000000000..05e249e57c9d --- /dev/null +++ b/media-video/noad/files/digest-noad-0.6.0-r7 @@ -0,0 +1,3 @@ +MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369 +RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369 +SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369 diff --git a/media-video/noad/noad-0.6.0-r7.ebuild b/media-video/noad/noad-0.6.0-r7.ebuild new file mode 100644 index 000000000000..13dad6dbe19d --- /dev/null +++ b/media-video/noad/noad-0.6.0-r7.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r7.ebuild,v 1.1 2006/12/28 20:02:01 zzam Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools + +DESCRIPTION="Mark commercial Breaks in VDR records" +HOMEPAGE="http://www.freepgs.com/noad/" +SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2 + mirror://vdrfiles/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="ffmpeg imagemagick" + +DEPEND="media-libs/libmpeg2 + media-video/vdr + ffmpeg? ( >=media-video/ffmpeg-0.4.8 ) + imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )" +RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5" + +src_unpack() { + + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-directoryfix.diff + epatch ${FILESDIR}/${P}-as-needed.diff + epatch ${FILESDIR}/${P}-cflags.diff + epatch ${FILESDIR}/${P}-framesize.diff + epatch ${FILESDIR}/${P}-delete-while-scanning.diff + epatch ${FILESDIR}/${P}-fix-osd.patch + + rm configure + eautoreconf +} + +src_compile() { + + econf \ + $(use_with ffmpeg) \ + $(use_with imagemagick magick) \ + --with-tools \ + --with-mpeginclude=/usr/include/mpeg2dec + + emake || die "emake faild" +} + +src_install() { + + dobin noad showindex + use imagemagick && dobin markpics + + dodoc COPYING README INSTALL + # example scripts are installed as dokumentation + dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html + + CONF_SOURCE=${FILESDIR}/0.6.0-r7 + insinto /etc/conf.d + newins ${CONF_SOURCE}/confd_vdraddon.noad vdraddon.noad + + insinto /usr/share/vdr/record + doins ${CONF_SOURCE}/record-50-noad.sh + + insinto /etc/vdr/reccmds + doins ${CONF_SOURCE}/reccmds.noad.conf + + exeinto /usr/share/vdr/bin + doexe ${CONF_SOURCE}/noad-reccmd +} + +pkg_postinst() { + + einfo + einfo "Congratulations, you have just installed noad!," + einfo "To integrate noad in VDR you should do this:" + einfo + einfo "start and set Parameter in /etc/conf.d/vdraddon.noad" + einfo + einfo "Note: You can use here all pararmeters for noad," + einfo "please look in the documentation of noad." + einfo +} -- cgit v1.2.3-65-gdbad