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

Package-Manager: portage-2.1.5.3

4 files changed, 122 insertions, 5 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/Manifest b/media-plugins/vdr-osdteletext/Manifest
index 29c44a2acce5..38ddd710c5fe 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -4,16 +4,18 @@ Hash: SHA1
 AUX confd 954 RMD160 08c0aef18697eda60f393b383f36e815e7bfe7af SHA1 59a5397dd2fb3a77cd0a6de650c09218dffb065f SHA256 8952e317dfb633ce65b9357cc30ddaef77cb338f2f1d56e103e3328499970eae
 AUX i18n_german_lang.diff 2033 RMD160 1bfb4d9dce21027dc1187f011923dd4ceb8a2073 SHA1 104e1d6b92ea4b685cdbaadf6ac508f6a4255c64 SHA256 b86ebaa74e3751eca352e97f554ea9f527886c63c9cae5ca274b68de8e3573f9
 AUX rc-addon.sh 995 RMD160 d0b8ad186970a377782c4cf3cf00c944895994fc SHA1 f8be26fc049ec1cd9cb992b7d8e66c8c760fc983 SHA256 006b1ab8ed875a403e138c1bb6b424f765b174741f3e1df909ded8a8d434c3f2
+AUX vdr-osdteletext-0.5.1-actdevice.diff 2506 RMD160 2ac781fefcb9cdd16577a154fcad3895a64bd22a SHA1 beb9eae14da217712fae97a16338962a5db4fea4 SHA256 4544efa1ed22574fc7157193cdf9a1fca3de026ea7811bbedb1ac6d1d317d809
 AUX vdr-osdteletext-0.5.1-vdr-1.5.patch 1646 RMD160 f87e53a04d1c660d2fae0d5cac9bc528e505f3a2 SHA1 0d4efeae2dafa1b8ca54e3d45b7340c92a1ea7b5 SHA256 88fcb36684c2c2c9b4c2cb5ddc912af17278b06e1595a3f30ac52bacf61eae7d
 DIST vdr-osdteletext-0.5.1.tgz 58631 RMD160 b53bee592844f4527917fe28a322e3561de19092 SHA1 acb2723c4208e083a34d3e23cfae1513615b63f7 SHA256 e3cb0b95d351d0fc63ba3e1ca82f776e44f1a1945ffad574b54a55e0169fa969
 EBUILD vdr-osdteletext-0.5.1-r1.ebuild 856 RMD160 2ab15b9589a079a7322f55ad2a85227011e69c9b SHA1 2b88a5fe04276a5a1f8f2cf4ff500d3b49bf10e9 SHA256 013544325754b97bb4d7dd33dc857b7dd9f4f226dc740931475da6c1e483482f
+EBUILD vdr-osdteletext-0.5.1-r2.ebuild 892 RMD160 5f91ba60c21554444603e56d5a31bae29810495f SHA1 d6be42adc2c15f35171c156c70c978aeb9b1b103 SHA256 76429a57a796e9e57eb55dc006d6f3a2a13ee0ac219ba22ff8bb60329f467b18
 EBUILD vdr-osdteletext-0.5.1.ebuild 818 RMD160 be72b1783b205638c43cfef40a68623cb22b2f59 SHA1 81877deacc5142ae37634133a08004f3e5f7c9ea SHA256 7140ff73ff623f962795745c456501a78b1c2f39f2d4fedf47c5e41ceb078040
-MISC ChangeLog 1611 RMD160 fddafdf76acbc7eca819a4416604eb25184dafeb SHA1 ecf6948826372fdc39810dbe2304dab535f95e34 SHA256 a1fb53807c63b1596195155ef7901482c4c8bdeb1d54180d8dd72b81ba6c894f
+MISC ChangeLog 1927 RMD160 ec8a75b5977e95b23f9e44e9a261d68d49e103e4 SHA1 2aa05e2d67da0ba30a053be9e1291cb6878b0618 SHA256 445ed64dc87c650f7aeb21bc2aa11ffced2b9dbd8751e7fdafa61d244e79053d
 MISC metadata.xml 428 RMD160 3be78f0eb360511ef05eb47d87aa3e59ef2484af SHA1 3321e1f1de113a21ae5e707d086f5dfda96467eb SHA256 7c0b6e088887e638b4fc4107b92dc81775cd3b8c9a55b16a05c2025de3e68150
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgVkkEACgkQt2vP6XvVdOfC4ACeLEoEODAbsNhsAo1y+GF/JWkJ
-VVoAn1xbdPeUNQepiNRF/wzwItNJG91c
-=8Lw2
+iEYEARECAAYFAkhG+m8ACgkQt2vP6XvVdOe1jACg2ebVnYE7rKuGwKNrntOBNOcv
+aQUAn3t6QkVlRblYQFWcuAUHjt33pBBt
+=rAAI
 -----END PGP SIGNATURE-----
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}
+
+}