version bump, thx to T.Rheinhold

(Portage version: 2.1.7.16/cvs/Linux i686)

11 files changed, 298 insertions, 176 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 25863f949ef3..175dc1016be8 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,17 @@
 # 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.38 2010/02/27 23:51:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.39 2010/03/21 16:42:30 hd_brummy Exp $
+
+*noad-0.7.1 (21 Mar 2010)
+
+  21 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/0.7.1/confd_vdraddon.noad, -noad-0.6.0-r7.ebuild,
+  -noad-0.6.0-r8.ebuild, +files/patches-0.7.x/noad-0.7.1-hangcheck.diff,
+  +files/0.7.1/noad-blacklist,
+  +files/patches-0.7.x/noad-0.7.1-ts_extension.diff, +noad-0.7.1.ebuild,
+  +files/0.7.1/record-50-noad.sh, +files/0.7.1/noad-reccmd,
+  +files/0.7.1/reccmds.noad.conf:
+  version bump, thx to T.Rheinhold
 
   27 Feb 2010; Joerg Bornkessel <hd_brummy@gentoo.org> -noad-0.7.0.ebuild:
   cleanup
diff --git a/media-video/noad/files/0.7.1/confd_vdraddon.noad b/media-video/noad/files/0.7.1/confd_vdraddon.noad
new file mode 100644
index 000000000000..59a2e1a8e42c
--- /dev/null
+++ b/media-video/noad/files/0.7.1/confd_vdraddon.noad
@@ -0,0 +1,71 @@
+# 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 $
+
+#########
+##
+# 	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"
+
+##	Use this nice-level when running noad / or no-niceness
+#	available Parameter
+#	no | 0 ... 19
+#NOAD_NICE_LEVEL="no"
+NOAD_NICE_LEVEL="18"
+
+##	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.7.1/noad-blacklist b/media-video/noad/files/0.7.1/noad-blacklist
new file mode 100644
index 000000000000..c91a6fa3bd5a
--- /dev/null
+++ b/media-video/noad/files/0.7.1/noad-blacklist
@@ -0,0 +1,7 @@
+# Put in some channels (syntax like channels.conf) in noad-blacklist file to disable the automatic NOAD-scan
+# Nevertheless, you can scan the vdr-files with the noad-command from OSD
+#
+# Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0
+#
+
+
diff --git a/media-video/noad/files/0.7.1/noad-reccmd b/media-video/noad/files/0.7.1/noad-reccmd
new file mode 100644
index 000000000000..3979baa574f9
--- /dev/null
+++ b/media-video/noad/files/0.7.1/noad-reccmd
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+VDR_RECORD_STATE=reccmd
+VDR_RECORD_NAME="${1}"
+
+. /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
+
diff --git a/media-video/noad/files/0.7.1/reccmds.noad.conf b/media-video/noad/files/0.7.1/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/0.7.1/reccmds.noad.conf
@@ -0,0 +1 @@
+Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/0.7.1/record-50-noad.sh b/media-video/noad/files/0.7.1/record-50-noad.sh
new file mode 100644
index 000000000000..bd20ba35753c
--- /dev/null
+++ b/media-video/noad/files/0.7.1/record-50-noad.sh
@@ -0,0 +1,83 @@
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.7.1/record-50-noad.sh,v 1.1 2010/03/21 16:42:27 hd_brummy Exp $
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Mathias Schwarzott <zzam@gentoo.org>
+#
+
+. /etc/conf.d/vdraddon.noad
+
+CMD="/usr/bin/noad"
+
+# Parameter to start NoAd
+# parameter are "no | yes"
+
+FORCE_OFFLINE_SCAN=no
+NOAD_CHANNEL_FILE="/etc/vdr/noad-blacklist"
+
+
+if [ "${VDR_RECORD_STATE}" = "after" ]; then
+unset -v NOAD_CHANNEL_ID
+VDR_RECORD_CHANNEL_ID=$(awk '($1 == "C") { print $2 }' "${VDR_RECORD_NAME}/info.vdr")
+
+        if [ -f "${NOAD_CHANNEL_FILE}" ]; then
+                awk -F: '{ printf "%s-%s-%s-%s\n",$4, $11, $12, $10; }' "${NOAD_CHANNEL_FILE}" | grep "${VDR_RECORD_CHANNEL_ID}"
+                if [ $? = 0 ]; then
+			mesg "NOAD-Scan aborted by /etc/vdr/noad-blacklist"
+                        exit
+                fi
+        fi
+fi
+
+
+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"
+
+: ${NOAD_NICE_LEVEL:=18}
+if [ "${NOAD_NICE_LEVEL}" != "no" ]; then
+	NOAD_NICE_LEVEL=$(($NOAD_NICE_LEVEL+0))
+	CMD="nice -n ${NOAD_NICE_LEVEL} ${CMD}"
+fi
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff
new file mode 100644
index 000000000000..37788a197fd7
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.1-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/files/patches-0.7.x/noad-0.7.1-ts_extension.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
new file mode 100644
index 000000000000..5f3e95a23321
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
@@ -0,0 +1,13 @@
+http://article.gmane.org/gmane.linux.vdr/42461/
+--- noad/noadifnew      2010-03-14 22:27:15.000000000 +0200
++++ noad-fix/noadifnew  2010-03-14 22:27:41.000000000 +0200
+@@ -12,7 +12,8 @@
+    exit -1
+ fi
+ fil="$2/marks.vdr"
+-if  test -a $fil
++filts="$2/marks"
++if [ -e $fil -o -e $filts ]
+ then
+   echo "noad already done for $2"
+ else
diff --git a/media-video/noad/noad-0.6.0-r7.ebuild b/media-video/noad/noad-0.6.0-r7.ebuild
deleted file mode 100644
index 4d11f7fd464f..000000000000
--- a/media-video/noad/noad-0.6.0-r7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 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.6 2007/11/27 11:45:45 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="~amd64 x86"
-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}"/patches-${PV}/directoryfix.diff
-	epatch "${FILESDIR}"/patches-${PV}/as-needed.diff
-	epatch "${FILESDIR}"/patches-${PV}/cflags.diff
-	epatch "${FILESDIR}"/patches-${PV}/framesize.diff
-	epatch "${FILESDIR}"/patches-${PV}/delete-while-scanning.diff
-	epatch "${FILESDIR}"/patches-${PV}/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 README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE="${FILESDIR}/0.6.0-r7"
-	newconfd "${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() {
-
-	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."
-	elog
-}
diff --git a/media-video/noad/noad-0.6.0-r8.ebuild b/media-video/noad/noad-0.6.0-r8.ebuild
deleted file mode 100644
index 46fb4fa7c31e..000000000000
--- a/media-video/noad/noad-0.6.0-r8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 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-r8.ebuild,v 1.3 2007/11/27 11:45:45 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="~amd64 ~x86"
-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}"/patches-${PV}/directoryfix.diff
-	epatch "${FILESDIR}"/patches-${PV}/as-needed.diff
-	epatch "${FILESDIR}"/patches-${PV}/cflags.diff
-	epatch "${FILESDIR}"/patches-${PV}/framesize.diff
-	epatch "${FILESDIR}"/patches-${PV}/delete-while-scanning.diff
-	epatch "${FILESDIR}"/patches-${PV}/fix-osd.patch
-	epatch "${FILESDIR}"/patches-${PV}/hangcheck.diff
-
-	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 README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE="${FILESDIR}/0.6.0-r7"
-	newconfd "${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() {
-
-	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."
-	elog
-	elog "noad now contains a hangcheck timer, to kill noad"
-	elog "if it runs longer than 30 minutes."
-}
diff --git a/media-video/noad/noad-0.7.1.ebuild b/media-video/noad/noad-0.7.1.ebuild
new file mode 100644
index 000000000000..4255742fdc8e
--- /dev/null
+++ b/media-video/noad/noad-0.7.1.ebuild
@@ -0,0 +1,83 @@
+# 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.1.ebuild,v 1.1 2010/03/21 16:42:30 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 \
+		"${FILESDIR}"/patches-0.7.x/"${P}"-ts_extension.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
+
+	insinto /etc/vdr/
+	doins "${CONF_SOURCE}"/noad-blacklist
+
+	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."
+	elog
+	elog "up from this version, noad works with .ts file structur"
+	elog "used in comming up version >=vdr-1.7.4"
+}