r1613 - in vdr/vdr-plugin-streamdev/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-12-09 21:15:26 +0000 (Fri, 09 Dec 2005)
New Revision: 1613

Added:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch
Removed:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch
Modified:
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
Log:
Replaced 91_cvs-20051107.dpatch by 91_cvs-20051209.dpatch to fix gcc4 issue


Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-12-08 21:41:31 UTC (rev 1612)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-12-09 21:15:26 UTC (rev 1613)
@@ -1,3 +1,9 @@
+vdr-plugin-streamdev (0.3.1+cvs20050522-13) unstable; urgency=low
+
+  * Replaced 91_cvs-20051107.dpatch by 91_cvs-20051209.dpatch to fix gcc4 issue
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Fri,  9 Dec 2005 22:14:29 +0100
+
 vdr-plugin-streamdev (0.3.1+cvs20050522-12) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>  

Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-12-08 21:41:31 UTC (rev 1612)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-12-09 21:15:26 UTC (rev 1613)
@@ -1,2 +1,2 @@
 01_Makefile-fPIC-fix
-91_cvs-20051107
+91_cvs-20051209

Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch	2005-12-08 21:41:31 UTC (rev 1612)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch	2005-12-09 21:15:26 UTC (rev 1613)
@@ -1,65 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 91_cvs-20051107.dpatch by Sascha Volkenandt <sascha at akv-soft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.3.36.
-
- at DPATCH@
---- old/client/filter.c	2005-05-22 00:29:37.000000000 +0200
-+++ cvs/client/filter.c	2005-11-07 02:04:01.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- *  $Id: filter.c,v 1.2 2005/02/08 13:59:16 lordjaxom Exp $
-+ *  $Id: filter.c,v 1.3 2005/11/06 16:43:58 lordjaxom Exp $
-  */
- 
- #include "client/filter.h"
-@@ -8,6 +8,7 @@
- #include "common.h"
- 
- #include <vdr/ringbuffer.h>
-+#include <vdr/device.h>
- 
- #if VDRVERSNUM >= 10300
- 
---- old/common.h	2005-06-07 19:14:24.000000000 +0200
-+++ cvs/common.h	2005-11-07 02:04:01.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- *  $Id: common.h,v 1.6 2005/05/09 20:22:29 lordjaxom Exp $
-+ *  $Id: common.h,v 1.7 2005/11/06 16:43:58 lordjaxom Exp $
-  */
-  
- #ifndef VDR_STREAMDEV_COMMON_H
-@@ -35,6 +35,10 @@
- #	define FLUSH() Skins.Flush()
- #endif
- 
-+#if VDRVERSNUM >= 10336
-+#	define MAXPARSEBUFFER KILOBYTE(16)
-+#endif
-+
- /* Check if a channel is a radio station. */
- #define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
- 
---- old/remux/ts2es.c	2005-06-07 19:14:27.000000000 +0200
-+++ cvs/remux/ts2es.c	2005-11-07 02:04:01.000000000 +0100
-@@ -2,6 +2,7 @@
- #include "server/streamer.h"
- #include "libdvbmpeg/transform.h"
- #include "common.h"
-+#include <vdr/device.h>
- 
- // from VDR's remux.c
- #define MAXNONUSEFULDATA (10*1024*1024)
---- old/remux/ts2ps.c	2005-06-07 19:14:27.000000000 +0200
-+++ cvs/remux/ts2ps.c	2005-11-07 02:04:01.000000000 +0100
-@@ -1,6 +1,7 @@
- #include "remux/ts2ps.h"
- #include "server/streamer.h"
- #include <vdr/channels.h>
-+#include <vdr/device.h>
- 
- class cTS2PS {
- 	friend void PutPES(uint8_t *Buffer, int Size, void *Data);

Copied: vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch (from rev 1531, vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch)
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch	2005-12-01 13:55:27 UTC (rev 1531)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051209.dpatch	2005-12-09 21:15:26 UTC (rev 1613)
@@ -0,0 +1,88 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 91_cvs-20051107.dpatch by Sascha Volkenandt <sascha at akv-soft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.36.
+
+ at DPATCH@
+diff -Nur streamdev-cvs20050522/client/filter.c streamdev-cvs20051209/client/filter.c
+--- streamdev-cvs20050522/client/filter.c	2005-05-22 00:29:37.000000000 +0200
++++ streamdev-cvs20051209/client/filter.c	2005-11-06 17:43:58.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- *  $Id: filter.c,v 1.2 2005/02/08 13:59:16 lordjaxom Exp $
++ *  $Id: filter.c,v 1.3 2005/11/06 16:43:58 lordjaxom Exp $
+  */
+ 
+ #include "client/filter.h"
+@@ -8,6 +8,7 @@
+ #include "common.h"
+ 
+ #include <vdr/ringbuffer.h>
++#include <vdr/device.h>
+ 
+ #if VDRVERSNUM >= 10300
+ 
+diff -Nur streamdev-cvs20050522/common.h streamdev-cvs20051209/common.h
+--- streamdev-cvs20050522/common.h	2005-05-22 00:29:37.000000000 +0200
++++ streamdev-cvs20051209/common.h	2005-11-06 17:43:58.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- *  $Id: common.h,v 1.6 2005/05/09 20:22:29 lordjaxom Exp $
++ *  $Id: common.h,v 1.7 2005/11/06 16:43:58 lordjaxom Exp $
+  */
+  
+ #ifndef VDR_STREAMDEV_COMMON_H
+@@ -35,6 +35,10 @@
+ #	define FLUSH() Skins.Flush()
+ #endif
+ 
++#if VDRVERSNUM >= 10336
++#	define MAXPARSEBUFFER KILOBYTE(16)
++#endif
++
+ /* Check if a channel is a radio station. */
+ #define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
+ 
+diff -Nur streamdev-cvs20050522/remux/ts2es.c streamdev-cvs20051209/remux/ts2es.c
+--- streamdev-cvs20050522/remux/ts2es.c	2005-05-22 00:29:37.000000000 +0200
++++ streamdev-cvs20051209/remux/ts2es.c	2005-11-06 17:43:58.000000000 +0100
+@@ -2,6 +2,7 @@
+ #include "server/streamer.h"
+ #include "libdvbmpeg/transform.h"
+ #include "common.h"
++#include <vdr/device.h>
+ 
+ // from VDR's remux.c
+ #define MAXNONUSEFULDATA (10*1024*1024)
+diff -Nur streamdev-cvs20050522/remux/ts2ps.c streamdev-cvs20051209/remux/ts2ps.c
+--- streamdev-cvs20050522/remux/ts2ps.c	2005-05-22 00:29:37.000000000 +0200
++++ streamdev-cvs20051209/remux/ts2ps.c	2005-11-06 17:43:58.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "remux/ts2ps.h"
+ #include "server/streamer.h"
+ #include <vdr/channels.h>
++#include <vdr/device.h>
+ 
+ class cTS2PS {
+ 	friend void PutPES(uint8_t *Buffer, int Size, void *Data);
+diff -Nur streamdev-cvs20050522/server/livefilter.h streamdev-cvs20051209/server/livefilter.h
+--- streamdev-cvs20050522/server/livefilter.h	2005-05-22 00:29:37.000000000 +0200
++++ streamdev-cvs20051209/server/livefilter.h	2005-11-07 20:28:41.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- *  $Id: livefilter.h,v 1.1.1.1 2004/12/30 22:44:27 lordjaxom Exp $
++ *  $Id: livefilter.h,v 1.2 2005/11/07 19:28:41 lordjaxom Exp $
+  */
+ 
+ #ifndef VDR_STREAMEV_LIVEFILTER_H
+@@ -11,6 +11,8 @@
+ 
+ #include <vdr/filter.h>
+ 
++class cStreamdevLiveStreamer;
++
+ class cStreamdevLiveFilter: public cFilter {
+ 	friend class cStreamdevLiveStreamer;
+