3 files changed, 115 insertions, 1 deletions
diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index c9551a46abe2..71ac464fc6f4 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,5 +1,6 @@
 AUX vdr-ttxtsubs-0.3.0_teletext-chars.patch 2983 BLAKE2B b18aa4f8a00ef102345531ba3fa02d2dc44ef1a5f38d93f74ba307b56828bc9861283fd8aa70777dc14c3bfb37688bfccee9ee4cc4259b2e2b7c45d21394ed7f SHA512 120ee81b47323792c94868a0e4b2bc3af26af9280854bc54a643777181ba6653920e6edb89558ee21eb94ee9983dbc929bd9a4d23ab8d5d7da0d1d644ca62408
+AUX vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch 4085 BLAKE2B 7bb61a31b1b906728f24f2107bc65975a599f9b3738a829957a8aec5b5a31db0226210f2e509fb37973ab1ea911da14ced2f543820943a24d0a6e86428be9f93 SHA512 e97d49697a185ebe43e96c0908e364007b8d5681f2a8448a6a810429d10a384669e82037ab136d64f32ab15bcd57ff6773baff6e417e21e1222388e074fe4194
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
-EBUILD vdr-ttxtsubs-0.3.0-r1.ebuild 600 BLAKE2B 6c3bc1696031316f9f6e89abeb2e1eb5f23f6dfd131709f2078ca429b322302c4c21393c065017aac3ff7cb63d9ed8ef41276bddfc35fbd278f4e32d8dbe6008 SHA512 1742e4d9fe6d423179332fd14d70a852914eaaf06b9ff6f2060defaead0e82e820ae4d3ffac960628dfde1dd53a4b0f8a1abf3090fd5118e8eb290366d45f9c0
+EBUILD vdr-ttxtsubs-0.3.0-r2.ebuild 695 BLAKE2B 2ff9913c73acfdfebf305dbbb7d37c44b1c1c3517903744caf45fc2ddc42681f64e307b75e3e06128738aa5943b6111ab3a8148a4708943b163b3779795ff112 SHA512 e7f3469bc6be4732e8cdd9d9115653c8798858a2e8195b336889a082894672c455a4996b665ec4092668c675ca9a473e2b1b534220cbb1204b6748d38e657fa6
 EBUILD vdr-ttxtsubs-0.3.0.ebuild 513 BLAKE2B cff7fbf91a6b9592c532dc81e92c3724a9dea10f6784e2a8eb380db75beeb220c1f1c5ba0e26b09ac8e62dcc8993401d9e4a69f1f720d5473b543e0aafb18028 SHA512 a187f1b95b6f7eb349233c8a604069528dd7acf9c764b95050e7689ea063bbce2fe740f33262c5af8f4db85a7627cf1211a4f7f6a6468cf84d294f450e42ee15
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch
new file mode 100644
index 000000000000..4b6bf2c05fd9
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch
@@ -0,0 +1,109 @@
+diff --git a/ttxtsubs.c b/ttxtsubs.c
+index f9b7bbc..5307c44 100644
+--- a/ttxtsubs.c
++++ b/ttxtsubs.c
+@@ -275,7 +275,8 @@ void cPluginTtxtsubs::Housekeeping(void)
+ 
+ const char *cPluginTtxtsubs::MainMenuEntry(void)
+ {
+-  bool haveChannel = Channels.GetByNumber(cDevice::ActualDevice()->CurrentChannel()) != NULL;
++  LOCK_CHANNELS_READ;
++  bool haveChannel = Channels->GetByNumber(cDevice::ActualDevice()->CurrentChannel()) != NULL;
+   switch(globals.mMainMenuEntry) {
+   case 1:
+     if(globals.mRealDoDisplay)
+@@ -349,7 +350,8 @@ void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber
+     DELETENULL(mLiveReceiver);
+     if (!Device->Replaying() && !Device->Transferring())
+     {
+-      cChannel* channel = Channels.GetByNumber(ChannelNumber);
++      LOCK_CHANNELS_READ;
++      const cChannel* channel = Channels->GetByNumber(ChannelNumber);
+       if (channel && channel->Tpid())
+       {
+         mLiveReceiver = new cTtxtSubsLiveReceiver(channel, this);
+diff --git a/ttxtsubschannelsettings.c b/ttxtsubschannelsettings.c
+index b543a36..7f9d326 100644
+--- a/ttxtsubschannelsettings.c
++++ b/ttxtsubschannelsettings.c
+@@ -48,8 +48,9 @@ bool cTtxtSubsChannelSetting::Parse(const char *s)
+       }
+       else { // parse old format
+         int sid;
++        LOCK_CHANNELS_READ;
+         if (1 == sscanf(buffer, "%d", &sid)) {
+-          for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
++          for (const cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch)) {
+             if (!ch->GroupSep() && ch->Sid() == sid) {
+               channelid=ch->GetChannelID();
+               pagemode=PageMode;
+diff --git a/ttxtsubslivereceiver.c b/ttxtsubslivereceiver.c
+index 9f60fdd..586d5af 100644
+--- a/ttxtsubslivereceiver.c
++++ b/ttxtsubslivereceiver.c
+@@ -22,7 +22,7 @@
+ #include <vdr/remux.h>
+ #include "ttxtsubslivereceiver.h"
+ 
+-cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(cChannel* channel, cVDRTtxtsubsHookListener* hook)
++cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(const cChannel* channel, cVDRTtxtsubsHookListener* hook)
+   :
+   _channel(channel),
+   _hook(hook)
+@@ -35,7 +35,7 @@ cTtxtSubsLiveReceiver::~cTtxtSubsLiveReceiver()
+   cReceiver::Detach();
+ }
+ 
+-void cTtxtSubsLiveReceiver::Receive(uchar *Data, int Length)
++void cTtxtSubsLiveReceiver::Receive(const uchar *Data, int Length)
+ {
+   if (Data == NULL)
+   {
+diff --git a/ttxtsubslivereceiver.h b/ttxtsubslivereceiver.h
+index d361c7b..0aba89b 100644
+--- a/ttxtsubslivereceiver.h
++++ b/ttxtsubslivereceiver.h
+@@ -29,12 +29,12 @@ class cTtxtSubsLiveReceiver : public cReceiver
+ {
+     private:
+       cTsToPes tsToPesTeletext;
+-      cChannel* _channel;
++      const cChannel* _channel;
+       cVDRTtxtsubsHookListener* _hook;
+     protected:
+-        virtual void Receive(uchar *Data, int Length);
++        virtual void Receive(const uchar *Data, int Length);
+     public:
+-        cTtxtSubsLiveReceiver(cChannel* channel, cVDRTtxtsubsHookListener* hook);
++        cTtxtSubsLiveReceiver(const cChannel* channel, cVDRTtxtsubsHookListener* hook);
+         virtual ~cTtxtSubsLiveReceiver();
+ };
+ 
+diff --git a/ttxtsubspagemenu.c b/ttxtsubspagemenu.c
+index cd7b6d0..b03949c 100644
+--- a/ttxtsubspagemenu.c
++++ b/ttxtsubspagemenu.c
+@@ -35,8 +35,9 @@ cTtxtsubsPageMenu::~cTtxtsubsPageMenu()
+ cTtxtsubsPageMenu::cTtxtsubsPageMenu()
+   :cOsdMenu(tr("Subtitle Page Settings"), 30)
+ {
++    LOCK_CHANNELS_READ;
+     cDevice *device = cDevice::ActualDevice();
+-    channel = Channels.GetByNumber(device->CurrentChannel());
++    channel = Channels->GetByNumber(device->CurrentChannel());
+     setting = TtxtSubsChannelSettings.Get(channel);
+     if (setting) {
+        origPageMode = mPageMode = setting->PageMode();
+diff --git a/ttxtsubspagemenu.h b/ttxtsubspagemenu.h
+index ad4bd48..ffe82d9 100644
+--- a/ttxtsubspagemenu.h
++++ b/ttxtsubspagemenu.h
+@@ -29,7 +29,7 @@
+ class cTtxtsubsPageMenu : public cOsdMenu 
+ {
+     private:
+-        cChannel *channel;
++        const cChannel *channel;
+         cTtxtSubsChannelSetting *setting;
+         int mPageNumber;
+         int mPageMode;
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
index 9fe2f3ec6aa1..5243d459cc00 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
@@ -23,4 +23,8 @@ src_prepare() {
 	vdr-plugin-2_src_prepare
 
 	eapply "${FILESDIR}/${P}_teletext-chars.patch"
+
+	if has_version ">=media-video/vdr-2.4"; then
+		eapply "${FILESDIR}/${P}_vdr-2.4.0.patch"
+	fi
 }