[SCM] vdr-plugin-xine packaging repository branch, master, updated. debian/0.9.4-7-4-g431c40a

[etobi]

The following commit has been merged in the master branch:
commit 0dccd92e561c2c1c761ff8763b133e9f02dec3cc
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 16 09:14:45 2013 +0100

    synched with yavdr

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 3df296f..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-* Create manpage for xineplayer
diff --git a/debian/changelog b/debian/changelog
index 33705ea..d9ea046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ vdr-plugin-xine (0.9.4-8) unstable; urgency=low
   * Standards-Version: 3.9.4
   * Build-depend in vdr-dev (>= 1.7.40)
   * Use debhelper 9
+  * Added patch to support VDR 1.7.33 and yaepg (taken from yavdr by
+    Lars Hanisch and Holger Schvestka )
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 16 Mar 2013 08:52:31 +0100
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/copyright b/debian/copyright
index 905b7fc..21dc355 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright:
     (C) 2003 - 2011 Reinhard Nissl
 
 Copyright (Debian packaging):
-    (C) 2003 - 2012 Tobias Grimm, Thomas Günther, Darren Salt, Thomas Schmidt
+    (C) 2003 - 2013 Tobias Grimm, Thomas Günther, Darren Salt, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify
diff --git a/debian/vdr-plugin-xine.docs b/debian/docs
similarity index 100%
rename from debian/vdr-plugin-xine.docs
rename to debian/docs
diff --git a/debian/vdr-plugin-xine.install b/debian/install
similarity index 100%
rename from debian/vdr-plugin-xine.install
rename to debian/install
diff --git a/debian/vdr-plugin-xine.links b/debian/links
similarity index 100%
rename from debian/vdr-plugin-xine.links
rename to debian/links
diff --git a/debian/vdr-plugin-xine.manpages b/debian/manpages
similarity index 100%
rename from debian/vdr-plugin-xine.manpages
rename to debian/manpages
diff --git a/debian/patches/enable-yaepg-support.patch b/debian/patches/enable-yaepg-support.patch
new file mode 100644
index 0000000..49848b9
--- /dev/null
+++ b/debian/patches/enable-yaepg-support.patch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile.dpatch by  <hotzenplotz5 at gmx.de>
+##
+##
+## DP: patch needed for yaepghd to work with plugin-xine
+
+ at DPATCH@
+Index: vdr-plugin-xine/Makefile
+===================================================================
+--- vdr-plugin-xine.orig/Makefile	2012-04-20 00:08:55.000000000 +0200
++++ vdr-plugin-xine/Makefile	2013-03-16 09:07:57.000000000 +0100
+@@ -49,7 +49,7 @@
+ VDR_XINE_VERIFY_BITMAP_DIRTY ?= 0
+ 
+ # enable to fully support yaepg plugin
+-#VDR_XINE_SET_VIDEO_WINDOW = 1
++VDR_XINE_SET_VIDEO_WINDOW = 1
+ 
+ # where are these utilities for image grabbing? (default: anywhere on your PATH)
+ #VDR_XINE_Y4MSCALER = /usr/bin/y4mscaler
diff --git a/debian/patches/series b/debian/patches/series
index 217c9b0..cb7a05c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+enable-yaepg-support.patch
 vdr-1.7.27.patch
+vdr-1.7.33.patch
diff --git a/debian/patches/vdr-1.7.27.patch b/debian/patches/vdr-1.7.27.patch
index b28c77c..7f4cc40 100644
--- a/debian/patches/vdr-1.7.27.patch
+++ b/debian/patches/vdr-1.7.27.patch
@@ -1,7 +1,7 @@
 Index: vdr-plugin-xine/xine.c
 ===================================================================
---- vdr-plugin-xine.orig/xine.c	2011-10-29 16:36:24.000000000 +0200
-+++ vdr-plugin-xine/xine.c	2012-04-20 00:07:31.000000000 +0200
+--- vdr-plugin-xine.orig/xine.c	2012-04-20 00:09:44.000000000 +0200
++++ vdr-plugin-xine/xine.c	2013-03-16 09:08:05.000000000 +0100
 @@ -13,7 +13,6 @@
  #include "xineDevice.h"
  #include "xineSettings.h"
diff --git a/debian/patches/vdr-1.7.33.patch b/debian/patches/vdr-1.7.33.patch
new file mode 100644
index 0000000..da27c83
--- /dev/null
+++ b/debian/patches/vdr-1.7.33.patch
@@ -0,0 +1,16 @@
+Index: vdr-plugin-xine/xineDevice.c
+===================================================================
+--- vdr-plugin-xine.orig/xineDevice.c	2011-10-29 16:36:24.000000000 +0200
++++ vdr-plugin-xine/xineDevice.c	2013-03-16 09:08:07.000000000 +0100
+@@ -1200,7 +1200,11 @@
+       int pid = TsPid(Data);
+       if (pid == 0)
+         patPmtParser.ParsePat(Data, TS_SIZE);
++#if VDRVERSNUM < 10733
+       else if (pid == patPmtParser.PmtPid())
++#else
++      else if (patPmtParser.IsPmtPid(pid))
++#endif
+         patPmtParser.ParsePmt(Data, TS_SIZE);
+       else if (pid == patPmtParser.Vpid())
+       {
diff --git a/debian/vdr-plugin-xine.preinst b/debian/preinst
similarity index 100%
rename from debian/vdr-plugin-xine.preinst
rename to debian/preinst
diff --git a/debian/rules b/debian/rules
index e957064..2f7543e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
                LOCALEDIR=debian/tmp/usr/share/locale
-CXXFLAGS += -fPIC $(LDFLAGS) $(CPPFLAGS)
+CXXFLAGS += -fPIC $(CPPFLAGS)
 
 %:
 	dh --parallel $@

-- 
vdr-plugin-xine packaging repository