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

[Thomas Günther]

Author: tom-guest
Date: 2007-01-17 01:14:49 +0100 (Wed, 17 Jan 2007)
New Revision: 4066

Added:
   vdr/vdr-plugin-dvd/trunk/debian/patches/91_dvd-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/patches/00list
Log:
Added 91_dvd-1.5.0.dpatch

Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2007-01-17 00:11:47 UTC (rev 4065)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2007-01-17 00:14:49 UTC (rev 4066)
@@ -1,3 +1,10 @@
+vdr-plugin-dvd (0.3.6~b03-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 91_dvd-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 17 Jan 2007 01:13:36 +0100
+
 vdr-plugin-dvd (0.3.6~b03-3) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2007-01-17 00:11:47 UTC (rev 4065)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2007-01-17 00:14:49 UTC (rev 4066)
@@ -4,4 +4,5 @@
 04_vdr-dvd_resume
 10_dvd.c
 
-90_APIVERSION.dpatch
+90_APIVERSION
+91_dvd-1.5.0

Added: vdr/vdr-plugin-dvd/trunk/debian/patches/91_dvd-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/91_dvd-1.5.0.dpatch	2007-01-17 00:11:47 UTC (rev 4065)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/91_dvd-1.5.0.dpatch	2007-01-17 00:14:49 UTC (rev 4066)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_dvd-1.5.0.dpatch by Urig at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=564669#post564669
+##
+## Thomas Günther <tom at toms-cafe.de>:
+##   - added compatibility to VDR < 1.5.0
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0.
+
+ at DPATCH@
+--- dvd-0.3.6_b03/control-dvd.c
++++ dvd-0.3.6_b03/control-dvd.c
+@@ -197,7 +197,12 @@
+ 
+     if (visible) {
+         OsdClose();
++#if APIVERSNUM >= 10500
++        visible = false;
++        SetNeedsFastResponse(false);
++#else
+         needsFastResponse = visible = false;
++#endif
+         modeOnly = false;
+         lastPlay = lastForward = false;
+         lastSpeed = -1;
+@@ -300,7 +305,11 @@
+     if (GetIndex(Current, Total) && Total > 0) {
+ 	    DEBUG_SHOW("DVD-Ctrl: ShowProgress: ... \n");
+         if (!visible) {
++#if APIVERSNUM >= 10500
++            SetNeedsFastResponse(true);
++#else
+             needsFastResponse = true;
++#endif
+             OsdOpen();
+         }
+         if (!visible)