Moved patches to subdirectory.

(Portage version: 2.1.2.7)

8 files changed, 196 insertions, 0 deletions

diff --git a/media-video/noad/files/patches-0.6.0/as-needed.diff b/media-video/noad/files/patches-0.6.0/as-needed.diff
new file mode 100644
index 000000000000..a1a38638aed4
--- /dev/null
+++ b/media-video/noad/files/patches-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/patches-0.6.0/cflags.diff b/media-video/noad/files/patches-0.6.0/cflags.diff
new file mode 100644
index 000000000000..bb8985ba4e18
--- /dev/null
+++ b/media-video/noad/files/patches-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/files/patches-0.6.0/delete-while-scanning.diff b/media-video/noad/files/patches-0.6.0/delete-while-scanning.diff
new file mode 100644
index 000000000000..0de5a8f2c929
--- /dev/null
+++ b/media-video/noad/files/patches-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/patches-0.6.0/directoryfix.diff b/media-video/noad/files/patches-0.6.0/directoryfix.diff
new file mode 100644
index 000000000000..23e94e858618
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/directoryfix.diff
@@ -0,0 +1,48 @@
+taken from http://vdr-portal.de/board/thread.php?threadid=38968
+
+diff -Nur noad.old/svdrpc.cpp noad.new/svdrpc.cpp
+--- noad.old/svdrpc.cpp	2005-02-12 18:32:10.000000000 +0100
++++ noad.new/svdrpc.cpp	2005-09-13 12:52:08.000000000 +0200
+@@ -250,13 +250,30 @@
+ {
+   char *baseName = NULL;
+   char *cp = NULL;
+-  char *vend = strchr(filename,'/');
+-  if( vend )
++  char *fname = NULL;
++  char *vend = NULL;
++  
++  asprintf(&fname, "%s", filename);
++  if(fname[strlen(fname) - 1] == '/')
++    fname[strlen(fname) - 1] = '\0';
++  vend = strrchr(fname,'/');
++  if(vend) {
++    *vend = '\0';
++    vend = strrchr(fname,'/');
++  }
++  
++  if( vend && vend[1] == '_')
++  {
++    *vend = '\0';
++    vend = strrchr(fname,'/');
++  }
++
++  if( vend && strchr(vend+1, '/'))
+     vend = strchr(vend+1,'/');
+   if( vend )
+-    asprintf(&baseName,"mesg %s %s",msg,vend+1);
++    asprintf(&baseName,"mesg %s '%s'",msg,vend+1);
+   else
+-    asprintf(&baseName,"mesg %s %s",msg, filename);
++    asprintf(&baseName,"mesg %s '%s'",msg, filename);
+   if( baseName[strlen(baseName)-1] == '/' )
+     baseName[strlen(baseName)-1] = '\0';
+   vend = strrchr(baseName, '/');
+@@ -268,6 +285,7 @@
+ 
+   free(baseName);
+   free(cp);
++  free(fname);
+ }
+ 
+ void noadStartMessage( const char *s)
diff --git a/media-video/noad/files/patches-0.6.0/fix-osd.patch b/media-video/noad/files/patches-0.6.0/fix-osd.patch
new file mode 100644
index 000000000000..d25eb0064e00
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/fix-osd.patch
@@ -0,0 +1,30 @@
+http://www.e-tobi.net/cgi-bin/viewcvs.cgi/vdr-addon-noad/trunk/debian/patches/10_fix-osd.dpatch?rev=1946&root=vdr+subversion+repository&view=auto
+
+Fixes problems with "noad --OSD" if vdr is not running.
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 16 Oct 2006
+
+--- old/svdrpc.cpp	Tue Jun 22 00:41:57 2004
++++ new/svdrpc.cpp	Sat Dec 18 19:54:44 2004
+@@ -189,6 +189,10 @@
+     {
+       select(1, &set, NULL, NULL, &timeout);
+       n = read(filedes, buf + rbytes, 1);
++      if(n<0) {
++        filedes=-1;
++        break;
++      }
+       rbytes += n;
+       if (rbytes == size)
+          break;
+@@ -214,7 +218,8 @@
+   while( i < 100 && outstandingReply > 0 )
+   {
+     usleep(10000);
+-    ReadReply();
++    if( !ReadReply() )
++      break;
+     i++;
+   }
+   return( outstandingReply <= 0 );
+
diff --git a/media-video/noad/files/patches-0.6.0/framesize.diff b/media-video/noad/files/patches-0.6.0/framesize.diff
new file mode 100644
index 000000000000..9f0e9d01d3e6
--- /dev/null
+++ b/media-video/noad/files/patches-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/files/patches-0.6.0/hangcheck.diff b/media-video/noad/files/patches-0.6.0/hangcheck.diff
new file mode 100644
index 000000000000..37788a197fd7
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/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.6.0/series b/media-video/noad/files/patches-0.6.0/series
new file mode 100644
index 000000000000..1753631f9bde
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/series
@@ -0,0 +1,6 @@
+directoryfix.diff
+as-needed.diff
+cflags.diff
+framesize.diff
+delete-while-scanning.diff
+fix-osd.patch