Added patch to solve zapping problem from http://vdr-portal.de/board/thread.php?threadid=70372. Thanks to hampelratte for noticing.

(Portage version: 2.1.5.3)

3 files changed, 116 insertions, 1 deletions

diff --git a/media-plugins/vdr-osdteletext/ChangeLog b/media-plugins/vdr-osdteletext/ChangeLog
index 775db9d6c53c..e003a49bef79 100644
--- a/media-plugins/vdr-osdteletext/ChangeLog
+++ b/media-plugins/vdr-osdteletext/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-osdteletext
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.11 2008/04/28 09:00:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.12 2008/06/04 20:26:13 zzam Exp $
+
+*vdr-osdteletext-0.5.1-r2 (04 Jun 2008)
+
+  04 Jun 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-osdteletext-0.5.1-actdevice.diff,
+  +vdr-osdteletext-0.5.1-r2.ebuild:
+  Added patch to solve zapping problem from
+  http://vdr-portal.de/board/thread.php?threadid=70372. Thanks to
+  hampelratte for noticing.
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-osdteletext-0.5.1.ebuild, vdr-osdteletext-0.5.1-r1.ebuild:
diff --git a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff
new file mode 100644
index 000000000000..183162258de1
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-actdevice.diff
@@ -0,0 +1,76 @@
+diff -Nur osdteletext-0.5.1/osdteletext.c osdteletext-0.5.1-patched/osdteletext.c
+--- osdteletext-0.5.1/osdteletext.c	2005-08-16 16:19:25.000000000 +0200
++++ osdteletext-0.5.1-patched/osdteletext.c	2008-06-03 16:17:25.000000000 +0200
+@@ -113,7 +113,6 @@
+       delete txtStatus;
+    if (channelStatus)
+       delete channelStatus;
+-   Storage::instance()->cleanUp();
+ }
+ 
+ const char *cPluginTeletextosd::CommandLineHelp(void)
+diff -Nur osdteletext-0.5.1/txtrecv.c osdteletext-0.5.1-patched/txtrecv.c
+--- osdteletext-0.5.1/txtrecv.c	2008-06-03 16:13:30.000000000 +0200
++++ osdteletext-0.5.1-patched/txtrecv.c	2008-06-03 16:20:56.000000000 +0200
+@@ -526,7 +526,7 @@
+ 
+ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+ {
+-   if (Device->IsPrimaryDevice()) {
++   if (Device->IsPrimaryDevice() || Device == cDevice::ActualDevice()) {
+ 
+ /*#ifdef OSDTELETEXT_REINSERTION_PATCH
+       if (ttSetup.suspendReceiving) {
+@@ -563,9 +563,9 @@
+       if (!channel)
+          return;
+       //primary device a full-featured card
+-      if (cDevice::PrimaryDevice()->ProvidesChannel(channel, Setup.PrimaryLimit)) {
++      if (cDevice::ActualDevice()->ProvidesChannel(channel, Setup.PrimaryLimit)) {
+           receiver = new cTxtReceiver(TPid, chan);
+-          cDevice::PrimaryDevice()->AttachReceiver(receiver);
++          cDevice::ActualDevice()->AttachReceiver(receiver);
+           //dsyslog("OSDTeletext: Created teletext receiver for channel %d, PID %d on primary device", ChNum, TPid);
+       //primary device a DXR3 or similar
+       } else {
+@@ -699,6 +699,7 @@
+ #else
+  : cReceiver(0, -1, 1, TPid), 
+ #endif
++cThread("osdteletext-receiver"),
+    chan(chan), TxtPage(0), buffer((188+60)*75), running(false)
+ {
+    Storage::instance()->prepareDirectory(chan);
+@@ -709,7 +710,7 @@
+ 
+ cTxtReceiver::~cTxtReceiver()
+ {
+-   Detach();
++   cReceiver::Detach();
+    if (running) {
+       running=false;
+       buffer.Signal();
+@@ -719,6 +720,12 @@
+    delete TxtPage;
+ }
+ 
++void cTxtReceiver::Stop()
++{
++   Activate(false);
++}
++
++
+ void cTxtReceiver::Activate(bool On)
+ {
+   if (On) {
+diff -Nur osdteletext-0.5.1/txtrecv.h osdteletext-0.5.1-patched/txtrecv.h
+--- osdteletext-0.5.1/txtrecv.h	2005-08-12 13:20:14.000000000 +0200
++++ osdteletext-0.5.1-patched/txtrecv.h	2008-06-03 16:21:56.000000000 +0200
+@@ -175,6 +175,7 @@
+ public:
+    cTxtReceiver(int TPid, tChannelID chan);
+    virtual ~cTxtReceiver();
++   virtual void Stop();
+ };
+ 
+ class cTxtStatus : public cStatus/*, public cThread*/ {
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r2.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..6cd726c00a31
--- /dev/null
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r2.ebuild,v 1.1 2008/06/04 20:26:13 zzam Exp ${VDRPLUGIN}/vdr-${VDRPLUGIN}-0.3.1.ebuild,v 1.1 2003/05/13 09:39:19 fow0ryl Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="Video Disk Recorder OSD-Teletext Plugin"
+HOMEPAGE="http://www.wiesweg-online.de/linux/linux.html"
+SRC_URI="http://www.wiesweg-online.de/linux/vdr/${P}.tgz
+		mirror://vdrfiles/${PN}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.5"
+
+PATCHES=("${FILESDIR}/i18n_german_lang.diff"
+	"${FILESDIR}/${P}-vdr-1.5.patch"
+	"${FILESDIR}/${P}-actdevice.diff")
+
+src_install() {
+	vdr-plugin_src_install
+
+	# create the teletext directory
+	diropts -m755 -ovdr -gvdr
+	keepdir /var/cache/${VDRPLUGIN}
+
+}