r1706 - in vdr/vdr-plugin-dvd/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-10 17:41:56 +0000 (Tue, 10 Jan 2006)
New Revision: 1706

Added:
   vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch
Modified:
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/control
   vdr/vdr-plugin-dvd/trunk/debian/patches/00list
Log:
vdr-plugin-dvd: Updated for vdr 1.3.38

Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2006-01-10 17:12:52 UTC (rev 1705)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2006-01-10 17:41:56 UTC (rev 1706)
@@ -1,3 +1,13 @@
+vdr-plugin-dvd (0.3.5.2+0.3.6b03-12) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Build-Depend on vdr (>=1.3.38-1)
+    - Added 03_vdr-1.3.38-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 10 Jan 2006 16:38:00 +0100
+
 vdr-plugin-dvd (0.3.5.2+0.3.6b03-11) unstable; urgency=low
  
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-dvd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control	2006-01-10 17:12:52 UTC (rev 1705)
+++ vdr/vdr-plugin-dvd/trunk/debian/control	2006-01-10 17:41:56 UTC (rev 1706)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.3.37-1), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.3.38-1), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-dvd

Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2006-01-10 17:12:52 UTC (rev 1705)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2006-01-10 17:41:56 UTC (rev 1706)
@@ -1,3 +1,4 @@
 01_Makefile-fPIC-fix
 02_ignore_not_existing_drive
+03_vdr-1.3.38-fix
 10_dvd.c

Added: vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch	2006-01-10 17:12:52 UTC (rev 1705)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch	2006-01-10 17:41:56 UTC (rev 1706)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_vdr-1.3.38-fix.dpatch by Urig at vdr-portal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes compilation with vdr 1.3.38
+
+ at DPATCH@
+diff -urNad vdr-plugin-dvd-0.3.5.2+0.3.6b03/control-dvd.c /tmp/dpep.bUEEQp/vdr-plugin-dvd-0.3.5.2+0.3.6b03/control-dvd.c
+--- vdr-plugin-dvd-0.3.5.2+0.3.6b03/control-dvd.c	2006-01-10 18:39:53.430250500 +0100
++++ /tmp/dpep.bUEEQp/vdr-plugin-dvd-0.3.5.2+0.3.6b03/control-dvd.c	2006-01-10 18:40:16.327681500 +0100
+@@ -54,13 +54,13 @@
+ 
+     player->setController(this);
+ 
+-    cStatus::MsgReplaying(this, "DVD");
++    cStatus::MsgReplaying(this, "DVD", "unknown title", true);
+ }
+ 
+ cDvdPlayerControl::~cDvdPlayerControl()
+ {
+     Hide();
+-    cStatus::MsgReplaying(this, NULL);
++    cStatus::MsgReplaying(this, "DVD", NULL, false);
+     Stop();
+     assert(dvd_active == true);
+     dvd_active = false;
+@@ -310,7 +310,7 @@
+             lastCurrent = lastTotal = -1;
+             last_title_buffer[0]=0;
+             displayReplay->SetTitle("unknown title");
+-            cStatus::MsgReplaying(this, "unknown title");
++            cStatus::MsgReplaying(this, "DVD", "unknown title", true);
+         }
+ 
+         if (player) {
+@@ -318,7 +318,7 @@
+             if ( strcmp(title_buffer,last_title_buffer) != 0 ) {
+                 displayReplay->SetTitle(title_buffer);
+                 if (!Initial) displayReplay->Flush();
+-                cStatus::MsgReplaying(this, title_buffer);
++                cStatus::MsgReplaying(this, "DVD", title_buffer, true);
+                 strcpy(last_title_buffer, title_buffer);
+             }
+         }
+@@ -568,7 +568,7 @@
+ 	        title_buffer = GetDisplayHeaderLine();
+             if ( strcmp(title_buffer,last_title_buffer) != 0 ) {
+  	            strcpy(last_title_buffer, title_buffer);
+- 	            cStatus::MsgReplaying(this, title_buffer);
++ 	            cStatus::MsgReplaying(this, "DVD", title_buffer, true);
+             }
+         }
+     }


Property changes on: vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *