r3352 - vdr/vdr-plugin-xineliboutput/trunk/debian/patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-09-10 19:31:18 +0000 (Sun, 10 Sep 2006)
New Revision: 3352

Added:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
Log:
changed nosignal order

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-09-10 19:01:51 UTC (rev 3351)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-09-10 19:31:18 UTC (rev 3352)
@@ -1 +1,2 @@
 10_nosignal
+99_nosignal-order

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch	                        (rev 0)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch	2006-09-10 19:31:18 UTC (rev 3352)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_nosignal-order.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060910~/xine_input_vdr.c vdr-plugin-xineliboutput-0.99rc4+cvs20060910/xine_input_vdr.c
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060910~/xine_input_vdr.c	2006-09-10 17:07:42.000000000 +0200
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060910/xine_input_vdr.c	2006-09-10 21:24:49.000000000 +0200
+@@ -1087,11 +1087,11 @@
+ 
+   asprintf(&home,"%s/.xine/nosignal.mpg", xine_get_homedir());
+   int fd = open(path=home, O_RDONLY);
+-  if(fd<0) fd = open(path=NOSIGNAL_IMAGE_FILE, O_RDONLY);
+   if(fd<0) fd = open(path="/etc/vdr/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
+   if(fd<0) fd = open(path="/etc/vdr/plugins/xine/noSignal.mpg", O_RDONLY);
+   if(fd<0) fd = open(path="/video/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
+   if(fd<0) fd = open(path="/video/plugins/xine/noSignal.mpg", O_RDONLY);
++  if(fd<0) fd = open(path=NOSIGNAL_IMAGE_FILE, O_RDONLY);
+   if(fd>=0) {
+     tmp = data = malloc(NOSIGNAL_MAX_SIZE);
+     datalen = read(fd, data, NOSIGNAL_MAX_SIZE);