Added patches for as-needed, save CXXFLAGS in configure, new script-set.

(Portage version: 2.1.1_pre1-r1)

10 files changed, 269 insertions, 1 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 1b52363a0912..3e55b2e56223 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,15 @@
 # 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.5 2006/05/19 22:26:16 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.6 2006/06/19 08:55:26 zzam Exp $
+
+*noad-0.6.0-r3 (19 Jun 2006)
+
+  19 Jun 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.6.0-r3/noad-reccmd, +files/noad-0.6.0-as-needed.diff,
+  +files/noad-0.6.0-cflags.diff, +files/0.6.0-r3/record-50-noad.sh,
+  +files/0.6.0-r3/confd_vdraddon.noad, +files/0.6.0-r3/reccmds.noad.conf,
+  +noad-0.6.0-r3.ebuild:
+  Added patches for as-needed, save CXXFLAGS in configure, new script-set.
 
   19 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> noad-0.6.0-r2.ebuild:
   typo fixed; set stabel on x86
diff --git a/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad
new file mode 100644
index 000000000000..84685706b9d5
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad
@@ -0,0 +1,56 @@
+# 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-r3/confd_vdraddon.noad,v 1.1 2006/06/19 08:55:26 zzam Exp $
+
+#########
+##
+# 	run Noad
+# 	available Parameter
+# 	no | yes
+#
+VDR_USE_NOAD="no"
+
+##	do scan while recording
+#	available Parameter
+#	yes | no
+#
+NOAD_ONLINE="no"
+
+##	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-r3/noad-reccmd b/media-video/noad/files/0.6.0-r3/noad-reccmd
new file mode 100644
index 000000000000..069a292f25cf
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r3/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-r3/reccmds.noad.conf b/media-video/noad/files/0.6.0-r3/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r3/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-r3/record-50-noad.sh b/media-video/noad/files/0.6.0-r3/record-50-noad.sh
new file mode 100644
index 000000000000..3b341edf7b27
--- /dev/null
+++ b/media-video/noad/files/0.6.0-r3/record-50-noad.sh
@@ -0,0 +1,52 @@
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r3/record-50-noad.sh,v 1.1 2006/06/19 08:55:26 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}" == "yes" ]] || return ;;
+
+*)	return ;;
+esac
+
+if [[ ${ALLOW_ONLINE} == yes ]]; then
+	[[ "${NOAD_ONLINE}" == "yes" ]] && CMD="${CMD} --online"
+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"
+
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/files/digest-noad-0.6.0-r2 b/media-video/noad/files/digest-noad-0.6.0-r2
index ebbd7f5e3f24..05e249e57c9d 100644
--- a/media-video/noad/files/digest-noad-0.6.0-r2
+++ b/media-video/noad/files/digest-noad-0.6.0-r2
@@ -1 +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/digest-noad-0.6.0-r3 b/media-video/noad/files/digest-noad-0.6.0-r3
new file mode 100644
index 000000000000..05e249e57c9d
--- /dev/null
+++ b/media-video/noad/files/digest-noad-0.6.0-r3
@@ -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-as-needed.diff b/media-video/noad/files/noad-0.6.0-as-needed.diff
new file mode 100644
index 000000000000..a1a38638aed4
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-as-needed.diff
@@ -0,0 +1,24 @@
+diff -ru noad-0.6.0-orig/Makefile.am noad-0.6.0/Makefile.am
+--- noad-0.6.0-orig/Makefile.am	2006-06-19 09:40:49.000000000 +0200
++++ noad-0.6.0/Makefile.am	2006-06-19 09:41:47.000000000 +0200
+@@ -4,8 +4,8 @@
+ libnoad_a_SOURCES=tools.cpp vdr_cl.cpp svdrpc.cpp tools.h vdr_cl.h svdrpc.h mpeg2wrap.cpp mpeg2wrap.h
+ 
+ bin_PROGRAMS=noad
+-noad_SOURCES=cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp noad.cpp tnoad.cpp noaddata.cpp\
+-	           audiotools.cpp main.cpp \
++noad_SOURCES=main.cpp cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp noad.cpp tnoad.cpp noaddata.cpp\
++	           audiotools.cpp \
+ 	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h noad.h tnoad.h noaddata.h videodir.h
+ 
+ noad_LDADD=libnoad.a
+@@ -14,8 +14,7 @@
+ EXTRA_PROGRAMS=markpics showindex
+ 
+ markpics_SOURCES=markpics.cpp
+-markpics_LDADD=libnoad.a
+-markpics_LDFLAGS=-lMagick++
++markpics_LDADD=libnoad.a -lMagick++
+ 
+ showindex_SOURCES=showindex.cpp
+ showindex_LDADD=libnoad.a
diff --git a/media-video/noad/files/noad-0.6.0-cflags.diff b/media-video/noad/files/noad-0.6.0-cflags.diff
new file mode 100644
index 000000000000..bb8985ba4e18
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-cflags.diff
@@ -0,0 +1,32 @@
+diff -ru noad-0.6.0-orig/configure.ac noad-0.6.0/configure.ac
+--- noad-0.6.0-orig/configure.ac	2006-06-19 09:35:21.005806971 +0200
++++ noad-0.6.0/configure.ac	2006-06-19 09:37:45.574799434 +0200
+@@ -122,16 +122,15 @@
+ 
+ AC_SUBST(PICSRC,"")
+ AC_MSG_CHECKING(for Magick++(2))
+-CFLAGS=$ac_save_CFLAGS
+-ac_save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -lMagick++"
++save_LDADD="$LDADD"
++LDADD="$LDADD -lMagick++"
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([#include <Magick++.h>
+ using namespace Magick;
+ ],[Image image;])
+ ],[AC_MSG_RESULT("yes");mpp_defined="1"],[AC_MSG_RESULT("no");mpp_defined="0"]
+ )
+-CXXFLAGS=$ac_save_CXXFLAGS
++LDADD=$save_LDADD
+ test $mpp_defined -eq 1 && test $havemagick -eq 1 && PICSRC="markpics"
+ 
+ dnl check for request to compile toolies
+@@ -170,7 +169,7 @@
+ AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr])
+ AC_CHECK_FUNCS([strsignal])
+ #CXXFLAGS='-g -O3 -pg'
+-CXXFLAGS='-g -O3'
++#CXXFLAGS='-g -O3'
+ 
+ if test "$withffmpeg" == "1"; then 
+   dnl check for a usable avcodec.h 
diff --git a/media-video/noad/noad-0.6.0-r3.ebuild b/media-video/noad/noad-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..43b5bccb2f08
--- /dev/null
+++ b/media-video/noad/noad-0.6.0-r3.ebuild
@@ -0,0 +1,82 @@
+# 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-r3.ebuild,v 1.1 2006/06/19 08:55:26 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
+
+	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
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/0.6.0-r3/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins ${FILESDIR}/0.6.0-r3/record-50-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins ${FILESDIR}/0.6.0-r3/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe ${FILESDIR}/0.6.0-r3/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 "More infos can be found on vdr.gentoo.de"
+	einfo
+	einfo "Note: You can use here all pararmeters for noad,"
+	einfo "please look in the documentation of noad."
+	einfo
+}