r4382 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-03-30 19:32:27 +0000 (Fri, 30 Mar 2007)
New Revision: 4382

Removed:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/11_posix-fixes.dpatch
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/91_xineliboutput-1.0.0pre7-1.5.1.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
Log:
* Removed 11_posix-fixes.dpatch (fixed upstream)
* Removed 91_xineliboutput-1.0.0pre7-1.5.1.dpatch (fixed upstream)

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-03-30 18:46:58 UTC (rev 4381)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2007-03-30 19:32:27 UTC (rev 4382)
@@ -3,6 +3,8 @@
   * (NOT RELEASED YET) New upstream release
   * Changed new upstream homepage and upstream author address in
     debian/copyright
+  * Removed 11_posix-fixes.dpatch (fixed upstream)
+  * Removed 91_xineliboutput-1.0.0pre7-1.5.1.dpatch (fixed upstream)
 
  -- Tobias Grimm <tg at e-tobi.net>  Fri, 30 Mar 2007 20:41:23 +0200
 

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2007-03-30 18:46:58 UTC (rev 4381)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2007-03-30 19:32:27 UTC (rev 4382)
@@ -1,3 +1 @@
 10_nosignal
-11_posix-fixes
-91_xineliboutput-1.0.0pre7-1.5.1

Deleted: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/11_posix-fixes.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/11_posix-fixes.dpatch	2007-03-30 18:46:58 UTC (rev 4381)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/11_posix-fixes.dpatch	2007-03-30 19:32:27 UTC (rev 4382)
@@ -1,32 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 11_posix-fixes by Joerg Schirottke <master at kanotix.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes the Makefile POSIX-compatible espeacially for Ubuntu
-
- at DPATCH@
---- vdr-plugin-xineliboutput-1.0.0~pre7.orig/Makefile
-+++ vdr-plugin-xineliboutput-1.0.0~pre7/Makefile
-@@ -20,10 +20,10 @@
- 
- XINELIBOUTPUT_FB  = 0
- XINELIBOUTPUT_X11 = 0
--XINELIBOUTPUT_XINEPLUGIN = $(shell (xine-config --cflags >& /dev/null && echo "1") || echo "0")
-+XINELIBOUTPUT_XINEPLUGIN = $(shell (xine-config --cflags >/dev/null 2>&1 && echo "1") || echo "0")
- ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1)
-     XINELIBOUTPUT_FB  = $(XINELIBOUTPUT_XINEPLUGIN)
--    XINELIBOUTPUT_X11 = $(shell (((echo "\#include <X11/Xlib.h>";echo "int main(int c,char* v[]) {return 0;}") > testx.c && gcc -c testx.c -o testx.o >&/dev/null) && echo "1") || echo "0" ; rm -f testx.* >/dev/null)
-+    XINELIBOUTPUT_X11 = $(shell (((echo "\#include <X11/Xlib.h>";echo "int main(int c,char* v[]) {return 0;}") > testx.c && gcc -c testx.c -o testx.o >/dev/null 2>&1) && echo "1") || echo "0" ; rm -f testx.* >/dev/null)
- 
-     ifeq ($(XINELIBOUTPUT_X11), 1)
-         #$(warning Detected X11)
-@@ -189,7 +189,7 @@
- 	     -DXINELIBOUTPUT_VERSION='"$(VERSION)"'
- 
- # check for yaegp patch
--DEFINES += $(shell grep 'vidWin' \$(VDRDIR)/osd.h >& /dev/null && echo "-DYAEGP_PATCH")
-+DEFINES += $(shell grep -q 'vidWin' \$(VDRDIR)/osd.h && echo "-DYAEGP_PATCH")
- 
- ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1)
-     CFLAGS += $(shell xine-config --cflags) 

Deleted: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/91_xineliboutput-1.0.0pre7-1.5.1.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/91_xineliboutput-1.0.0pre7-1.5.1.dpatch	2007-03-30 18:46:58 UTC (rev 4381)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/91_xineliboutput-1.0.0pre7-1.5.1.dpatch	2007-03-30 19:32:27 UTC (rev 4382)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_xineliboutput-1.0.0pre7-1.5.1.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/xineliboutput-1.0.0pre7-1.5.1.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.1.
-
- at DPATCH@
---- xineliboutput-1.0.0pre7/frontend_local.c
-+++ xineliboutput-1.0.0pre7/frontend_local.c
-@@ -17,6 +17,9 @@
- 
- #include <vdr/config.h>
- #include <vdr/tools.h>
-+#if APIVERSNUM >= 10501
-+#include <vdr/shutdown.h>
-+#endif
- 
- #include "logdefs.h"
- #include "config.h"
-@@ -471,7 +474,11 @@
- 
-     if(!m_bReconfigRequest && xc.exit_on_close) {
-       LOGMSG("Shutting down VDR");
-+#if APIVERSNUM >= 10501
-+      ShutdownHandler.RequestEmergencyExit();
-+#else
-       cThread::EmergencyExit(true);
-+#endif
-       break;
-     }
-   }