fix for new svdrp port 6419, used in >=vdr-1.7.15

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

4 files changed, 102 insertions, 9 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 80566f534670..7c91d540b186 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.44 2010/06/16 14:19:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.45 2010/09/05 17:43:18 hd_brummy Exp $
+
+*noad-0.7.2-r1 (05 Sep 2010)
+
+  05 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  files/0.7.1/confd_vdraddon.noad, +noad-0.7.2-r1.ebuild:
+  fix for new svdrp port 6419, used in >=vdr-1.7.15
 
   16 Jun 2010; Alexis Ballier <aballier@gentoo.org>
   +files/patches-0.7.x/noad-0.7.2-cflags.patch, noad-0.7.2.ebuild:
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 93bdd640fc2a..5efe57e3ef0d 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -5,7 +5,7 @@ AUX 0.6.0-r7/confd_vdraddon.noad 1443 RMD160 aa1dd8349139cb1aebfb06a759e57370ca6
 AUX 0.6.0-r7/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 AUX 0.6.0-r7/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
 AUX 0.6.0-r7/record-50-noad.sh 1565 RMD160 636d255d5fa2fa76ff054fe53f8a7d7ae062ccc5 SHA1 091770c66d77de3d49ffc2e9faf2b8e842069c11 SHA256 d46b7763cb89ab1ebea889c1bcfa9f1362b376256901397e6c6dc61b73095a1f
-AUX 0.7.1/confd_vdraddon.noad 1445 RMD160 d3ec1ffc0b5458e5f7bce3bc0fdf2d1aee527ee1 SHA1 79b76dbb7a59d1cd3f1b89996df1bd97cbd2ea5f SHA256 63d888c8d3c1a5404e41f13f254e9fc4babf376a17faae0d084e3fe4caa53bdc
+AUX 0.7.1/confd_vdraddon.noad 1479 RMD160 e75ab97dca1c5d9ddbd354dea663381e2b4b34cb SHA1 8610543619dbefc759050225a2d9c5218b706337 SHA256 ce00ad9670920d8287dc68a964ed30e4a99c48f9188dc239f9ce4eb067abc907
 AUX 0.7.1/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 AUX 0.7.1/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
 AUX 0.7.1/record-50-noad.sh 1567 RMD160 137d42dc529e7aeb870431297752588384c5f8c3 SHA1 e9811601a5782c9f053e0e315b40f11ead49dffa SHA256 a588586b051eafc7513668e579214f98570cf9e4432879c47ceb588e5a7ec15d
@@ -25,13 +25,15 @@ AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741
 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
 EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91
+EBUILD noad-0.7.2-r1.ebuild 2147 RMD160 2a792085dd13ad8f53910aaef228ce506abc1098 SHA1 00268dcce5f4acb2ac8757b8d646fdafdbf0fee2 SHA256 20270a1b429902644f325641cac71915653eec67b98c43089b0973c905e18372
 EBUILD noad-0.7.2.ebuild 2051 RMD160 d943cd8244ef5bad0a2aebf198da7bcf9adef509 SHA1 e49004bfa0fc37231ad1e1cc3bdacc4205150840 SHA256 7c030f71cf398899f25d5a4f89bc4db2cc4bf3b5ca404f877d3f663956981f7b
-MISC ChangeLog 9387 RMD160 fa30800cd35676834fce866b7af997127cd3f360 SHA1 02041f587de15e99f956055e4dfe40e583f69042 SHA256 2bea0c68b6181aec6b310cec0c36d23ce629d890eee9b1325370600eb6927605
+MISC ChangeLog 9584 RMD160 91dbfd79cb56ede7946c0fd2e9f82905e6109067 SHA1 40cfe4b0feaeb14118ac9099961535a40c6f840a SHA256 4ef0ea90ca8b8c4f352a45195f8717d0c7213201ff1b458193b6f022783b5ffa
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkwY3XgACgkQvFcC4BYPU0rn/wCgili8cmqr/kQEcN5mOtRp0WRk
-JXQAn3UoV35J2E7ud3JdEZzrcqodhTJw
-=En/Z
+iD8DBQFMg9cQdn07HTTCgIoRAncaAJ9wAxMBCk3BqI/FD8/Xzf8CBENczgCcDRCa
+4dE9gdhAdMK/zylI6AZFyaQ=
+=A9yo
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/0.7.1/confd_vdraddon.noad b/media-video/noad/files/0.7.1/confd_vdraddon.noad
index 59a2e1a8e42c..eae61b501b20 100644
--- a/media-video/noad/files/0.7.1/confd_vdraddon.noad
+++ b/media-video/noad/files/0.7.1/confd_vdraddon.noad
@@ -1,6 +1,6 @@
 # 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.7.1/confd_vdraddon.noad,v 1.1 2010/03/21 16:42:27 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.7.1/confd_vdraddon.noad,v 1.2 2010/09/05 17:43:18 hd_brummy Exp $
 
 #########
 ##
@@ -44,7 +44,8 @@ NOAD_JUMP="yes"
 #
 NOAD_OVERLAP="yes"
 
-##	send an OSD-Message to localhost:2001 for start and end 
+##	send an OSD-Message to localhost:2001 ( >=vdr-1.7.15 localhost:6419 )
+#	for start and end 
 # 	available Parameter
 # 	yes | no
 #
diff --git a/media-video/noad/noad-0.7.2-r1.ebuild b/media-video/noad/noad-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..164978365735
--- /dev/null
+++ b/media-video/noad/noad-0.7.2-r1.ebuild
@@ -0,0 +1,84 @@
+# 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-r1.ebuild,v 1.1 2010/09/05 17:43:18 hd_brummy Exp $
+
+EAPI="2"
+
+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? ( >=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
+	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-cflags.patch
+	eautoreconf
+	# UINT64_C is needed by ffmpeg headers
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	if has_version ">=media-video/vdr-1.5.17"; 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."
+}