# 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.42 2010/03/27 20:36:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.43 2010/03/27 20:37:47 hd_brummy Exp $
+
+ 27 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+ -noad-0.7.0.20100119.ebuild, -noad-0.7.1-r1.ebuild:
+ cleanup
27 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
-files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch,
+++ /dev/null
-http://bugs.gentoo.org/show_bug.cgi?id=305571
-
---- Makefile.am
-+++ Makefile.am
-@@ -14,8 +14,7 @@ noinst_PROGRAMS=@PICSRC@ @TOOLSRC@
- EXTRA_PROGRAMS=markpics showindex
-
- markpics_SOURCES=markpics.cpp
--markpics_LDADD=libnoad.a
--markpics_LDFLAGS=-lMagick++
-+markpics_LDADD=libnoad.a -lMagick++
- markpics_CXXFLAGS=@markpiccxxflags@
- showindex_SOURCES=showindex.cpp
- showindex_LDADD=libnoad.a
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_gcc4.4.dpatch by <Gerald Dachs <gda@dachsweb.de>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad noad-0.7.0~/svdrpc.cpp noad-0.7.0/svdrpc.cpp
---- noad-0.7.0~/svdrpc.cpp 2009-12-22 23:20:50.000000000 +0100
-+++ noad-0.7.0/svdrpc.cpp 2009-12-22 23:23:11.000000000 +0100
-@@ -256,7 +256,7 @@
- {
- char *baseName = NULL;
- char *cp = NULL;
-- char *vend = strchr(filename,'/');
-+ const char *vend = strchr(filename,'/');
- if( vend )
- vend = strchr(vend+1,'/');
- if( vend )
-@@ -265,9 +265,9 @@
- asprintf(&baseName,"mesg %s %s",msg, filename);
- if( baseName[strlen(baseName)-1] == '/' )
- baseName[strlen(baseName)-1] = '\0';
-- vend = strrchr(baseName, '/');
-- if( vend )
-- *vend = '\0';
-+ char *vend1 = strrchr(baseName, '/');
-+ if( vend1 )
-+ *vend1 = '\0';
- asprintf(&cp,"%s\r\n",baseName);
-
- VDRMessage(cp);
-diff -urNad noad-0.7.0~/vdr_cl.cpp noad-0.7.0/vdr_cl.cpp
---- noad-0.7.0~/vdr_cl.cpp 2009-12-22 23:20:50.000000000 +0100
-+++ noad-0.7.0/vdr_cl.cpp 2009-12-22 23:20:50.000000000 +0100
-@@ -1200,7 +1200,7 @@
- sortBuffer = NULL;
- fileName = strdup(FileName);
- FileName += strlen(VideoDirectory) + 1;
-- char *p = strrchr(FileName, '/');
-+ const char *p = strrchr(FileName, '/');
-
- name = NULL;
- summary = NULL;
-
-diff -Naur noad-0.7.0.orig/showindex.cpp noad-0.7.0/showindex.cpp
---- noad-0.7.0.orig/showindex.cpp 2010-01-05 19:22:48.000000000 +0100
-+++ noad-0.7.0/showindex.cpp 2010-01-05 19:23:31.000000000 +0100
-@@ -46,8 +46,8 @@
- uchar PictureType; // current picture-type
- int Length; // frame-lenght of current frame
- char pictypes[]= { 'U','I','P','B' };
-- char *indents[]= { "",""," "," " };
-- char *indents2[]= { ""," "," ","" };
-+ const char *indents[]= { "",""," "," " };
-+ const char *indents2[]= { ""," "," ","" };
- int lastFile=0;
- int lastOffset = 0;
- unsigned char readBuffer[BYTES_TO_READ+1];
+++ /dev/null
-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);
-
+++ /dev/null
-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
+++ /dev/null
-# 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.0.20100119.ebuild,v 1.2 2010/02/25 18:44:08 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Mark commercial Breaks in VDR records"
-HOMEPAGE="http://noad.heliohost.org/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${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 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
- epatch "${FILESDIR}"/patches-0.6.0/hangcheck.diff \
- "${FILESDIR}"/patches-0.7.x/${P}-asneeded.patch
-
- if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
- sed -e "s:include/ffmpeg:include/libavcodec:g" -i configure.ac
- fi
-
- rm configure
- eautoreconf
-}
-
-src_configure() {
-
- econf \
- $(use_with ffmpeg) \
- $(use_with imagemagick magick) \
- --with-tools \
- --with-mpeginclude=/usr/include/mpeg2dec
-}
-
-src_compile() {
-
- emake noad || die "emake faild"
-}
-
-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.6.0-r7"
- 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."
- elog
- elog "up from this version, noad works with .ts file structur"
- elog "used in comming up version >=vdr-1.7.4"
-}
+++ /dev/null
-# 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-r1.ebuild,v 1.1 2010/03/21 21:18:50 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
-
- 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."
-}
projects / gentoo.git / commitdiff