From 263023987e846b17b2f90044b25e2c7b4bc996ad Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Wed, 24 Mar 2010 20:20:27 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.1.7.16/cvs/Linux i686 --- media-video/noad/ChangeLog | 8 +- media-video/noad/Manifest | 11 ++- .../patches-0.7.x/noad-0.7.2-hangcheck.diff | 21 +++++ media-video/noad/noad-0.7.2.ebuild | 76 +++++++++++++++++++ 4 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff create mode 100644 media-video/noad/noad-0.7.2.ebuild 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 + +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/Manifest b/media-video/noad/Manifest index 2ddda1596025..d679c0b39b45 100644 --- a/media-video/noad/Manifest +++ b/media-video/noad/Manifest @@ -23,20 +23,23 @@ AUX patches-0.7.x/noad-0.7.0.20100119-asneeded.patch 389 RMD160 cab42bdd50b110ee AUX patches-0.7.x/noad-0.7.0_gcc-4.4.diff 2023 RMD160 cc199fc64fdbad9f87ac7cb41965208bf5936042 SHA1 8c95de380a16019de7bdfa293a0dff9f584348cf SHA256 bb7d6b7ee1a9275a8dddf3cb5557c7643acf06f1c5cddd415e9ebc1737d96c7b AUX patches-0.7.x/noad-0.7.1-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 AUX patches-0.7.x/noad-0.7.1-ts_extension.diff 334 RMD160 277d89598555966b1af4f226ba26b5b04404a825 SHA1 4dc5f76d29e4bb70c67a9dacc3884580e9c80e6b SHA256 a7d6fc55e447fc3cc8ced7e706c5f65ef94aa0dce2f1293dbdd156b04cbeedcd +AUX patches-0.7.x/noad-0.7.2-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 DIST noad-0.7.0.20100119.tar.bz2 173003 RMD160 6d5ec182355d2a946872f0b4a74a788a5dd8acc4 SHA1 533fdc433da7b7c889682cc7813a08a57b34660f SHA256 fdebe0c497d5d2254c5bc400a95d6190d713263e0b83f6f83392ec41c0c3053d DIST noad-0.7.1.tar.bz2 175081 RMD160 5bba0456d86c2c0e04edd4c99f2d8612a2713b44 SHA1 9cbde315e51158548ea58c6879db690e0edc5c31 SHA256 c036f2759c11a9cd3fd94d4b1a83fbb5bb8e70026e93fffc6ad4a53b379e8387 +DIST noad-0.7.2.tar.bz2 175293 RMD160 c4ab24407a695d1831fd205be0f36ad23ef711e2 SHA1 cdf3acd0b0a31a56a39edda5025e8c2848370c44 SHA256 5ee00ecaabfe4d9e5c8e6de028a661121f681b59f5cb4387853e5010c194e08f EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91 EBUILD noad-0.7.0.20100119.ebuild 2183 RMD160 99b8788531c38bb4d445141366c9581d8e142690 SHA1 970083df9835219e8d4980faf88dcabe2a3968ec SHA256 43ec8b9fd178d2bba1e40ac1ad0acd93cfc931ad2808f07258b721a061e1b62f EBUILD noad-0.7.1-r1.ebuild 1941 RMD160 af06be43b816857a9d7e936e2ce516a7c0b517fd SHA1 42ed5cb72344cd1f1408bb4e639e736f39b323eb SHA256 a94f729ebb6f5b21cfd967cc64770a0e1df55b9dab0a940bbac36535f145ebae -MISC ChangeLog 8649 RMD160 e45a549370d05091b18fcb95dcd20a75ac134ee8 SHA1 83d7944f5f42c9ad21c1177b8cf44d704e18481f SHA256 2396001caae4dd2bf16fabe863835e0f025e17ce36ac545819c112fcc8d12f9e +EBUILD noad-0.7.2.ebuild 1881 RMD160 fc2317af4d6d8d71af4eada4bac75964174d7993 SHA1 9d7011065ac65de16998d4c694091e00f2b2ebe6 SHA256 faad6518dd3e4048e2fb3ef6957fc88a387f531383b5df3ccb7d31a9052dc7cc +MISC ChangeLog 8817 RMD160 219c73e33345546a7486deb9c96ace678587f33b SHA1 cf5b559e2164cbcfdd67554ccd39794d303b694d SHA256 f76413f154c4ffd7cf345f7296a234355ed12a977b65c8edef2d9864f3e86834 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFLpowmdn07HTTCgIoRAkJeAJ0QZa1iaPJ6aG3G35h28UfSUd1tHwCeK4L9 -qaegCFkYsPgpuf9kzDPuxFA= -=8bw7 +iD8DBQFLqnLzdn07HTTCgIoRApXnAKCFzae5ZGrK7tWqvMDnmqRSCz9SegCfckC7 +4BEHfbk+a2+jw9dubildA8o= +=l52p -----END PGP SIGNATURE----- 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." +} -- 2.26.2