Added two bugfixes, see Bug #147267. Added option for more niceness of noad-process.

(Portage version: 2.1.2_pre2-r5)

9 files changed, 267 insertions, 1 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 5a803de263f7..76cecdfdccce 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.9 2006/08/01 19:43:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.10 2006/10/07 11:19:01 zzam Exp $
+
+*noad-0.6.0-r5 (07 Oct 2006)
+
+  07 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.6.0-r5/noad-reccmd, +files/noad-0.6.0-delete-while-scanning.diff,
+  +files/noad-0.6.0-framesize.diff, +files/0.6.0-r5/record-50-noad.sh,
+  +files/0.6.0-r5/confd_vdraddon.noad, +files/0.6.0-r5/reccmds.noad.conf,
+  +noad-0.6.0-r5.ebuild:
+  Added two bugfixes, see Bug #147267. Added option for more niceness of
+  noad-process.
 
   01 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to VDR-Project.
diff --git a/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad
new file mode 100644
index 000000000000..9b21b7adf7bb
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad
@@ -0,0 +1,65 @@
+# 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.6.0-r5/confd_vdraddon.noad,v 1.1 2006/10/07 11:19:01 zzam 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"
+
+##	start noad with nice
+#	available Parameter
+#	yes | no
+NOAD_NICE="yes"
+
+##	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"
+
+##	add your own parameter here,
+# 	yust run 'noad' in konsole for more parameter
+NOAD_PARAMETER=""
+
+
+
+
+
+
diff --git a/media-video/noad/files/0.6.0-r5/noad-reccmd b/media-video/noad/files/0.6.0-r5/noad-reccmd
new file mode 100644
index 000000000000..069a292f25cf
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r5/noad-reccmd
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+VDR_RECORD_STATE=reccmd
+VDR_RECORD_NAME="${1}"
+
+source /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
+
diff --git a/media-video/noad/files/0.6.0-r5/reccmds.noad.conf b/media-video/noad/files/0.6.0-r5/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r5/reccmds.noad.conf
@@ -0,0 +1 @@
+Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/0.6.0-r5/record-50-noad.sh b/media-video/noad/files/0.6.0-r5/record-50-noad.sh
new file mode 100644
index 000000000000..85957348b364
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r5/record-50-noad.sh
@@ -0,0 +1,62 @@
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r5/record-50-noad.sh,v 1.1 2006/10/07 11:19:01 zzam Exp $
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Mathias Schwarzott <zzam@gentoo.org>
+#
+
+source /etc/conf.d/vdraddon.noad
+
+CMD="/usr/bin/noad"
+
+# Parameter to start NoAd
+# parameter are "no | yes"
+
+
+ALLOW_ONLINE=yes
+
+if [[ ${VDR_RECORD_STATE} == reccmd ]]; then
+	# script started from reccmd
+	VDR_USE_NOAD=yes
+	VDR_RECORD_STATE=after
+	ALLOW_ONLINE=no
+	NOAD_ONLY_SCAN_IF_NO_PTSMARKS=no
+fi
+
+[[ ${VDR_USE_NOAD} == "yes" ]] || return
+
+
+case "${VDR_RECORD_STATE}" in
+after)	: ;;
+
+before)	[[ "${NOAD_ONLINE}" == "no" ]] && return ;;
+
+*)	return ;;
+esac
+
+if [[ ${ALLOW_ONLINE} == yes ]]; then
+	case "${NOAD_ONLINE}" in
+		live|yes)
+			CMD="${CMD} --online=1"
+			;;
+		all)
+			CMD="${CMD} --online=2"
+			;;
+	esac
+fi
+
+if [[ ${NOAD_ONLY_SCAN_IF_NO_PTSMARKS} == yes ]]; then
+	[[ -f ${VDR_RECORD_NAME}/ptsmarks.vdr ]] && return
+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"
+
+if [[ ${NOAD_NICE} == yes ]]; then
+	CMD="nice ${CMD}"
+fi
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/files/digest-noad-0.6.0-r5 b/media-video/noad/files/digest-noad-0.6.0-r5
new file mode 100644
index 000000000000..05e249e57c9d
--- /dev/null
+++ b/media-video/noad/files/digest-noad-0.6.0-r5
@@ -0,0 +1,3 @@
+MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
+RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
+SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/noad-0.6.0-delete-while-scanning.diff b/media-video/noad/files/noad-0.6.0-delete-while-scanning.diff
new file mode 100644
index 000000000000..0de5a8f2c929
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-delete-while-scanning.diff
@@ -0,0 +1,23 @@
+diff -ru noad-0.6.0-orig/tools.cpp noad-0.6.0/tools.cpp
+--- noad-0.6.0-orig/tools.cpp	2006-09-22 14:33:32.000000000 +0200
++++ noad-0.6.0/tools.cpp	2006-10-06 10:09:35.000000000 +0200
+@@ -17,6 +17,8 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <execinfo.h>
++#include <sys/types.h>
++#include <signal.h>
+ 
+ extern int SysLogLevel;
+ 
+@@ -961,6 +963,10 @@
+     esyslog(LOG_ERR, "ERROR: frame larger than buffer (%d > %d)", Length, Max);
+     Length = Max;
+   }
++  if (f == -1) {
++    esyslog(LOG_ERR, "ERROR: cannot open video-file (recording deleted while scanning or bad index-file)");
++    kill(getpid(),SIGTERM);
++  }
+   //int r = safe_read(f, b, Length);
+   int r = read( f,b,Length);
+   if (r < 0)
diff --git a/media-video/noad/files/noad-0.6.0-framesize.diff b/media-video/noad/files/noad-0.6.0-framesize.diff
new file mode 100644
index 000000000000..9f0e9d01d3e6
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-framesize.diff
@@ -0,0 +1,12 @@
+diff -ru noad-0.6.0-orig/vdr_cl.h noad-0.6.0/vdr_cl.h
+--- noad-0.6.0-orig/vdr_cl.h	2006-10-07 11:25:46.164645112 +0200
++++ noad-0.6.0/vdr_cl.h	2006-10-07 11:26:01.022074938 +0200
+@@ -52,7 +52,7 @@
+ 
+ #define KILOBYTE(n) ((n) * 1024)
+ // The maximum size of a single frame:
+-#define MAXFRAMESIZE  KILOBYTE(192)
++#define MAXFRAMESIZE  KILOBYTE(256)
+ 
+ #define FRAMESPERSEC 25
+ #define FRAMESPERMIN (FRAMESPERSEC*60)
diff --git a/media-video/noad/noad-0.6.0-r5.ebuild b/media-video/noad/noad-0.6.0-r5.ebuild
new file mode 100644
index 000000000000..4af2a12651e3
--- /dev/null
+++ b/media-video/noad/noad-0.6.0-r5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 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-r5.ebuild,v 1.1 2006/10/07 11:19:01 zzam Exp $
+
+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="~x86 ~amd64"
+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}/${P}-directoryfix.diff
+	epatch ${FILESDIR}/${P}-as-needed.diff
+	epatch ${FILESDIR}/${P}-cflags.diff
+	epatch ${FILESDIR}/${P}-framesize.diff
+	epatch ${FILESDIR}/${P}-delete-while-scanning.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 COPYING README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+	CONF_SOURCE=${FILESDIR}/0.6.0-r5
+	insinto /etc/conf.d
+	newins ${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() {
+
+	einfo
+	einfo "Congratulations, you have just installed noad!,"
+	einfo "To integrate noad in VDR you should do this:"
+	einfo
+	einfo "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	einfo
+	einfo "Note: You can use here all pararmeters for noad,"
+	einfo "please look in the documentation of noad."
+	einfo
+}