version bump, fix for newer ffmpeg, bug #394741; thx to E.Seifert

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 123 insertions, 11 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 57a6a3b440d6..bb0f4b48d312 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.49 2011/04/06 17:33:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.50 2011/12/28 21:38:26 hd_brummy Exp $
+
+*noad-0.7.3 (28 Dec 2011)
+
+  28 Dec 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/patches-0.7.x/noad-0.7.3-hangcheck.diff, +noad-0.7.3.ebuild:
+  version bump, fix for newer ffmpeg, bug #394741; thx to E.Seifert
 
   06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> noad-0.6.0-r9.ebuild,
   noad-0.7.2-r2.ebuild:
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index d8385fd878c3..ff5edd9ca309 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 0.6.0-r7/confd_vdraddon.noad 1443 RMD160 aa1dd8349139cb1aebfb06a759e57370ca6bf1e8 SHA1 5b2d15efa42a366b89a6ab6271f94618cad3c194 SHA256 6a1728d5b27f7964d0032f1f522f7057d8a5ebd8d6b542ad85fb4fc924b2308d
 AUX 0.6.0-r7/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
@@ -21,21 +21,21 @@ AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6
 AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
 AUX patches-0.7.x/noad-0.7.2-cflags.patch 504 RMD160 1687a8e9ea8809f40580b82d26813889d8fe3b12 SHA1 686d438e68753ea45a4d30b8dfe3aea872d2fc26 SHA256 b0ac44bc934c79d8198e16eca784889082818e6470191fad13a137ab9fd138c6
 AUX patches-0.7.x/noad-0.7.2-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
+AUX patches-0.7.x/noad-0.7.3-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.2.tar.bz2 175293 RMD160 c4ab24407a695d1831fd205be0f36ad23ef711e2 SHA1 cdf3acd0b0a31a56a39edda5025e8c2848370c44 SHA256 5ee00ecaabfe4d9e5c8e6de028a661121f681b59f5cb4387853e5010c194e08f
+DIST noad-0.7.3.tar.bz2 174036 RMD160 a5b4b9ec272b0662c896a32ffbbbb74da088d33c SHA1 317de559d0fb784c70070760c41f06ec6fbcc122 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb
 EBUILD noad-0.6.0-r9.ebuild 2548 RMD160 4eea5c7d4c08e3f187d2369850f85328cb66418a SHA1 6d97bf6739b17513cbc9a314abb3796e3c13bbe6 SHA256 1994cd3bfa502c559ffd3dfda5c7cd533daef9851e98124ab7e1ae0f410a099f
 EBUILD noad-0.7.2-r2.ebuild 2186 RMD160 72addc157f54017127e98043b73d3fa56b103837 SHA1 7e4af56c30a59ebc05597bec1bf20b875be042d1 SHA256 7ef056edf0ee9d52ba2153b79da7fc7180e773597e74959cc088832e99029df1
-MISC ChangeLog 10226 RMD160 5ead4940f1c8a300a7a92c61eb9e1c598067d883 SHA1 306972dc59541cf89fdae2e643acc80f087051db SHA256 46ce98e78c2bc4ee0f63704c829713bec3d78679035b168b8fe09f25b412c2df
+EBUILD noad-0.7.3.ebuild 2131 RMD160 491596548f21a9d550edf5972802cbdfb8a6916b SHA1 86d8f2583b167a6a02696bcad26b0d88564a95ea SHA256 57ef0fe60bf2489e08ece6022ddec297035a9cc666924f38da5444650e0fa2ec
+MISC ChangeLog 10451 RMD160 9e0c503b62632e1decfa8b7bd7c751598a29c9b6 SHA1 2a3b8c554919b5456f8c0b95c751fe58775a1971 SHA256 68901ba9ceb0bc89181a2173dca3e8a5c0214dadd560ed589c608a987a5ca5bf
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQEcBAEBCAAGBQJNnKPbAAoJEMOx0zmdw4Z1oHkH/0uKkXkmcqKBgRa6RPz1WxbN
-AGtwFBMijG2Zt7NOzrcSm0cFoN5RhyzCZ6tnFyPfES6c8YuKyQ8IaLTruCHcHEu8
-yBbhvCQrBtRsKKv/kS3ccxmoPOswicYUX6C6K3ydLThRy7ETusKbaEctzF7uKBik
-VVzz43qHfBke4BZG3UVc9DHrbqyg14bL8lkpB51M1cdYg+ztUltuya1VmwRCGa+/
-FygYPjH9lI3pYvlghxX0CDrF19X+tex0FjUagqwyTnShKfIkfstLjWG1c6uSLt8b
-XRyxfhNwc0g7jEq3JiRdZvvaSOy+1yF6uzV8i2jbVqVwlocWnCTuvLCu26q3/QM=
-=9d/p
+iD8DBQFO+4xcdn07HTTCgIoRAtQlAKCnO9V2TZzOwvvKTPhMItOXlGBbHwCfVFPv
+IFtQ8zC2KQDjVGGRZ8EFWjg=
+=F1V/
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff
new file mode 100644
index 000000000000..37788a197fd7
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3-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.3.ebuild b/media-video/noad/noad-0.7.3.ebuild
new file mode 100644
index 000000000000..9e497acb6349
--- /dev/null
+++ b/media-video/noad/noad-0.7.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.1 2011/12/28 21:38:26 hd_brummy Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools
+
+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? ( >=virtual/ffmpeg-0.4.8 )
+	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )
+	!media-plugins/vdr-markad"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff
+	eautoreconf
+	# UINT64_C is needed by ffmpeg headers
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	if has_version ">=media-video/vdr-1.7.15"; then
+		sed -e "s:2001:6419:" -i svdrpc.cpp
+	fi
+}
+
+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."
+}