diff options
author | Jörg Bornkessel <hd_brummy@gentoo.org> | 2010-03-24 20:20:27 +0000 |
---|---|---|
committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2010-03-24 20:20:27 +0000 |
commit | 3d9300771891606ed7037354506da8efef21931a (patch) | |
tree | de3ecd9bf89c3498f719a6ce56d07da6616b6e22 /media-video | |
parent | stable x86, bug 308379 (diff) | |
download | gentoo-2-3d9300771891606ed7037354506da8efef21931a.tar.gz gentoo-2-3d9300771891606ed7037354506da8efef21931a.tar.bz2 gentoo-2-3d9300771891606ed7037354506da8efef21931a.zip |
version bump
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/noad/ChangeLog | 8 | ||||
-rw-r--r-- | media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff | 21 | ||||
-rw-r--r-- | media-video/noad/noad-0.7.2.ebuild | 76 |
3 files changed, 104 insertions, 1 deletions
diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog index cda1cddd51ec..f929497f43d3 100644 --- a/media-video/noad/ChangeLog +++ b/media-video/noad/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/noad # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.40 2010/03/21 21:18:50 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.41 2010/03/24 20:20:27 hd_brummy Exp $ + +*noad-0.7.2 (24 Mar 2010) + + 24 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org> + +files/patches-0.7.x/noad-0.7.2-hangcheck.diff, +noad-0.7.2.ebuild: + version bump *noad-0.7.1-r1 (21 Mar 2010) diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff new file mode 100644 index 000000000000..37788a197fd7 --- /dev/null +++ b/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff @@ -0,0 +1,21 @@ +diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp +--- noad-0.6.0-orig/main.cpp 2007-05-12 17:28:01.000000000 +0200 ++++ noad-0.6.0/main.cpp 2007-05-12 18:20:30.000000000 +0200 +@@ -566,10 +566,17 @@ + signal(SIGABRT, signal_handler); + signal(SIGSEGV, signal_handler); + signal(SIGUSR1, signal_handler); ++ signal(SIGALRM, signal_handler); + + // do cleanup at exit... + atexit(cleanUp); + ++ ++ if (!bOnline) { ++ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) ++ alarm(30*60); ++ } ++ + // now do the work.., + doNoad(bBefore, recDir); + diff --git a/media-video/noad/noad-0.7.2.ebuild b/media-video/noad/noad-0.7.2.ebuild new file mode 100644 index 000000000000..4fe4bab7701d --- /dev/null +++ b/media-video/noad/noad-0.7.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2.ebuild,v 1.1 2010/03/24 20:20:27 hd_brummy Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="Mark commercial Breaks in VDR records" +HOMEPAGE="http://noad.heliohost.org/" +SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ffmpeg imagemagick" + +DEPEND="media-libs/libmpeg2 + ffmpeg? ( >=media-video/ffmpeg-0.4.8 ) + imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )" + +src_prepare() { + + epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff +} + +src_configure() { + + local=myconf + use ffmpeg && myconf="--with-ffmpeg --with-ffmpeginclude=/usr/include" + + econf \ + ${myconf} \ + $(use_with imagemagick magick) \ + --with-mpeginclude=/usr/include/mpeg2dec +# --with-tools # fails on showindex, marcpics compile +} + +src_install() { + + dobin noad +# fix me later! +# dobin noad showindex +# use imagemagick && dobin markpics + + dodoc README INSTALL + # example scripts are installed as dokumentation + dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html + + CONF_SOURCE="${FILESDIR}/0.7.1" + newconfd "${CONF_SOURCE}"/confd_vdraddon.noad vdraddon.noad + + insinto /usr/share/vdr/record + doins "${CONF_SOURCE}"/record-50-noad.sh + + insinto /usr/share/vdr/shutdown + doins "${FILESDIR}"/pre-shutdown-15-noad.sh + + insinto /etc/vdr/reccmds + doins "${CONF_SOURCE}"/reccmds.noad.conf + + exeinto /usr/share/vdr/bin + doexe "${CONF_SOURCE}"/noad-reccmd +} + +pkg_postinst() { + + elog + elog "Congratulations, you have just installed noad!," + elog "To integrate noad in VDR you should do this:" + elog + elog "start and set Parameter in /etc/conf.d/vdraddon.noad" + elog + elog "Note: You can use here all pararmeters for noad," + elog "please look in the documentation of noad." +} |