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

[Thomas Günther]

Author: tom-guest
Date: 2005-11-08 18:33:23 +0000 (Tue, 08 Nov 2005)
New Revision: 1478

Added:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch
Removed:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr_1.3.32-fix.dpatch
Modified:
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
Log:
Removed 02_vdr_1.3.32-fix.dpatch, added 91_cvs-20051107.dpatch

Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-11-08 18:26:53 UTC (rev 1477)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-11-08 18:33:23 UTC (rev 1478)
@@ -1,3 +1,13 @@
+vdr-plugin-streamdev (0.3.1+cvs20050522-12) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Removed 02_vdr_1.3.32-fix.dpatch
+    - Added 91_cvs-20051107.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  8 Nov 2005 19:30:46 +0100
+
 vdr-plugin-streamdev (0.3.1+cvs20050522-11) unstable; urgency=low
 
   * NOT RELEASED YET

Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-11-08 18:26:53 UTC (rev 1477)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-11-08 18:33:23 UTC (rev 1478)
@@ -1,2 +1,2 @@
 01_Makefile-fPIC-fix
-02_vdr_1.3.32-fix
+91_cvs-20051107

Deleted: vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr_1.3.32-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr_1.3.32-fix.dpatch	2005-11-08 18:26:53 UTC (rev 1477)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr_1.3.32-fix.dpatch	2005-11-08 18:33:23 UTC (rev 1478)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_vdr_1.3.32-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix building for vdr 1.3.32
-
- at DPATCH@
-diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050522/client/filter.c /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/client/filter.c
---- vdr-plugin-streamdev-0.3.1+cvs20050522/client/filter.c	2005-09-11 21:49:11.357677496 +0200
-+++ /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/client/filter.c	2005-09-11 21:49:12.288535984 +0200
-@@ -8,6 +8,7 @@
- #include "common.h"
- 
- #include <vdr/ringbuffer.h>
-+#include <vdr/device.h>
- 
- #if VDRVERSNUM >= 10300
- 
-diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2es.h /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2es.h
---- vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2es.h	2005-05-22 00:29:37.000000000 +0200
-+++ /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2es.h	2005-09-11 21:49:55.368986760 +0200
-@@ -3,6 +3,7 @@
- 
- #include "remux/tsremux.h"
- #include <vdr/ringbuffer.h>
-+#include <vdr/device.h>
- 
- class cTS2ES;
- class cRingBufferLinear;
-diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2ps.c /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2ps.c
---- vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2ps.c	2005-05-22 00:29:37.000000000 +0200
-+++ /tmp/dpep.TvsJ2Z/vdr-plugin-streamdev-0.3.1+cvs20050522/remux/ts2ps.c	2005-09-11 21:49:38.905489592 +0200
-@@ -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);

Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch	2005-11-08 18:26:53 UTC (rev 1477)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/91_cvs-20051107.dpatch	2005-11-08 18:33:23 UTC (rev 1478)
@@ -0,0 +1,65 @@
+#!/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);