commit: 1fef03fd0742f841f877455506740995ad7d059b Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Sat Feb 7 22:13:31 2026 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Feb 7 23:51:22 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fef03fd
media-plugins/vdr-zappilot: drop 0.0.5-r2 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Part-of: https://github.com/gentoo/gentoo/pull/45676 Closes: https://github.com/gentoo/gentoo/pull/45676 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> media-plugins/vdr-zappilot/Manifest | 1 - .../files/vdr-zappilot-0.0.5_vdr-2.3.1.patch | 281 --------------------- .../vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild | 28 -- 3 files changed, 310 deletions(-) diff --git a/media-plugins/vdr-zappilot/Manifest b/media-plugins/vdr-zappilot/Manifest index aea5107ec13a..3014e2bb1eb5 100644 --- a/media-plugins/vdr-zappilot/Manifest +++ b/media-plugins/vdr-zappilot/Manifest @@ -1,2 +1 @@ -DIST vdr-zappilot-0.0.5.tgz 17061 BLAKE2B 334c1a27cb24792b4cf1d8ab29672d141b0a996097b230208e2c9a78317693d1a46b9949ef610d506255bc441c9ce35760bc322843ce78f4658f4a32aef0808e SHA512 9f1dfd3ecb38c5a4afdcad963f2680fe3c5e8dbe4610de0ccc8967811e51ca5e4ad268b9d01a5e4dd392ffa275bf896dd03225bc6568a72d92063a1dfa576222 DIST vdr-zappilot-0.0.6.tar.gz 16860 BLAKE2B 3cff5dd5993fb15b80c161ccd72c0eafd1a44798341c74cb0395759a4bde8b2885aedd8d430ef404bf5a6da6a7fdf1ffcaace7e76af03971fd35a670966bf57e SHA512 aaf39b7bc77fcccde93ff2fdd67093203f74fccfd37fbac4c8979016f6da082ba1bd5798e25831700545d29ece09cc12814670445d44bafd1f103c2bd265ffb0 diff --git a/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch deleted file mode 100644 index 4a6c4e25b68d..000000000000 --- a/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch +++ /dev/null @@ -1,281 +0,0 @@ -compile fix >=vdr-2.3.1 -http://www.vdr-portal.de/board1-news/board2-vdr-news/p1254875-announce-vdr-developer-version-2-3-1/#post1254875 -Signed-of-by: Joerg Bornkessel <[email protected]> (25 Okt 2015) - -diff -rupN b/zappilotosd.c a/zappilotosd.c ---- b/zappilotosd.c 2015-06-24 14:32:15.000000000 +0200 -+++ a/zappilotosd.c 2015-10-22 18:39:36.000000000 +0200 -@@ -69,7 +69,7 @@ cZappilotOsd::~cZappilotOsd(void) - - void cZappilotOsd::DisplayChannel(const cChannel *Channel) - { -- int BufSize = 255; -+ int BufSize = 1020; - if (Channel) - { - if (Channel->GroupSep()) -@@ -172,11 +172,11 @@ void cZappilotOsd::UpdateEPGInfo(int Now - titleFollowingInfo = NULL; - subtitlePresentInfo = NULL; - subtitleFollowingInfo = NULL; -- cSchedulesLock SchedulesLock; -- const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock); -+ LOCK_SCHEDULES_READ; -+ LOCK_CHANNELS_READ; - if (Schedules) - { -- const cSchedule *Schedule = Schedules->GetSchedule(Channels.GetByNumber(PilotChannelNumber)->GetChannelID()); -+ const cSchedule *Schedule = Schedules->GetSchedule(Channels->GetByNumber(PilotChannelNumber)->GetChannelID()); - if (Schedule) - { - // Get Present event -@@ -267,9 +267,9 @@ void cZappilotOsd::UpdateEPGInfo(int Now - void cZappilotOsd::Show() - { - // find the actual current -- cChannel *Channel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); -- currentChannel = Channels.GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); -- -+ LOCK_CHANNELS_READ; -+ const cChannel *Channel = Channels->GetByNumber(cDevice::PrimaryDevice()->CurrentChannel()); -+ currentChannel = Channel; - if (Channel) - { - PilotChannelNumber = Channel->Number(); -@@ -333,13 +333,14 @@ eOSState cZappilotOsd::ProcessKey(eKeys - case k1 ... k9: - if (number >= 0) - { -- if (number > Channels.MaxNumber()) -+ LOCK_CHANNELS_READ; -+ if (number > Channels->MaxNumber()) - number = Key - k0; - else - number = number * 10 + Key - k0; - if (number > 0) - { -- cChannel *channel = Channels.GetByNumber(number); -+ const cChannel *channel = Channels->GetByNumber(number); - if (channel) - { - PilotChannelNumber = channel->Number(); -@@ -363,7 +364,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - if (config.fastbrowse) - { - CursorDown(); -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index()-1; - break; -@@ -380,7 +382,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - if (config.fastbrowse) - { - CursorUp(); -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index()-1; - break; -@@ -396,7 +399,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - { - if (group < 0) - { -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index(); - } -@@ -405,15 +409,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys - int SaveGroup = group; - if (NORMALKEY(Key) == kRight) - { -- group = Channels.GetNextGroup(group); -+ LOCK_CHANNELS_READ; -+ group = Channels->GetNextGroup(group); - } - else - { -- group = Channels.GetPrevGroup(group < 1 ? 1 : group); -+ LOCK_CHANNELS_READ; -+ group = Channels->GetPrevGroup(group < 1 ? 1 : group); - } - if (group < 0) - group = SaveGroup; -- cChannel *channel = Channels.Get(group); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->Get(group); - if (channel) - { - //DisplayChannel(channel); -@@ -449,7 +456,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - else - { - CursorUp(); -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index()-1; - break; -@@ -466,20 +474,22 @@ eOSState cZappilotOsd::ProcessKey(eKeys - else - { - CursorDown(); -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) -- group = channel->Index()-1; -+ group = channel->Index()-1; - break; - } - case kNone: - if (number && (int)cTimeMs::Now() - lastTime > 1000) - { -- if (Channels.GetByNumber(number)) -+ LOCK_CHANNELS_READ; -+ if (Channels->GetByNumber(number)) - { - PilotChannelNumber = number; - lastTime = cTimeMs::Now(); - number = 0; -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index()-1; - } -@@ -553,7 +563,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - { - if (group < 0) - { -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - if (channel) - group = channel->Index(); - } -@@ -562,15 +573,18 @@ eOSState cZappilotOsd::ProcessKey(eKeys - int SaveGroup = group; - if (NORMALKEY(Key) == kBlue) - { -- group = Channels.GetNextGroup(group); -+ LOCK_CHANNELS_READ; -+ group = Channels->GetNextGroup(group); - } - else - { -- group = Channels.GetPrevGroup(group < 1 ? 1 : group); -+ LOCK_CHANNELS_READ; -+ group = Channels->GetPrevGroup(group < 1 ? 1 : group); - } - if (group < 0) - group = SaveGroup; -- cChannel *channel = Channels.Get(group); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->Get(group); - if (channel) - { - //DisplayChannel(channel); -@@ -663,8 +677,8 @@ eOSState cZappilotOsd::ProcessKey(eKeys - void cZappilotOsd::CursorUp() - { - int n = PilotChannelNumber + 1; -- cChannel *channel; -- channel = Channels.GetByNumber(n, 1); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(n, 1); - if (channel) - { - n = channel->Number(); -@@ -678,8 +692,8 @@ void cZappilotOsd::CursorUp() - void cZappilotOsd::CursorDown() - { - int n = PilotChannelNumber - 1; -- cChannel *channel; -- channel = Channels.GetByNumber(n, -1); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(n, -1); - if (channel) - { - n = channel->Number(); -@@ -693,9 +707,13 @@ void cZappilotOsd::CursorDown() - void cZappilotOsd::CursorOK() - { - DrawMenu(0,2); -- if (currentChannel != Channels.GetByNumber(PilotChannelNumber)) -+ LOCK_CHANNELS_READ; -+ const cChannel* chan = Channels->GetByNumber(PilotChannelNumber); -+ -+ if (currentChannel != chan) - { -- cChannel *Channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *Channel = Channels->GetByNumber(PilotChannelNumber); - if (Channel) - { - cDevice::PrimaryDevice()->SwitchChannel(Channel, true); -@@ -750,7 +768,8 @@ void cZappilotOsd::DisplayInfo(int delta - displayTimer = NULL; - displayChannel = Skins.Current()->DisplayChannel(true); - } -- cChannel *channel = Channels.GetByNumber(PilotChannelNumber); -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByNumber(PilotChannelNumber); - - if (!isempty(titlePresentInfo)) - { -@@ -778,14 +797,17 @@ void cZappilotOsd::DisplayExtraInfo() - displayEvent = NULL; - } - -- displayEvent = new cMenuEvent(Present,false,true); -+ -+ LOCK_TIMERS_READ; -+ LOCK_CHANNELS_READ; -+ displayEvent = new cMenuEvent(Timers, Channels, Present,false,true); - displayEvent->Display(); - } - - - void cZappilotOsd::DisplayTimer() - { -- -+ - if (displayChannel) - { - delete displayChannel; -@@ -797,13 +819,17 @@ void cZappilotOsd::DisplayTimer() - displayEvent = NULL; - } - -+ LOCK_TIMERS_WRITE; -+ - cTimer *timer = new cTimer(Present); -- cTimer *t = Timers.GetTimer(timer); -+ cTimer *t = Timers->GetMatch(Present); -+ - if (t) - { - delete timer; - timer = t; - } -+ - displayTimer=new cMenuEditTimer(timer, !t); - displayTimer->Display(); - } -diff -rupN b/zappilotosd.h a/zappilotosd.h ---- b/zappilotosd.h 2015-06-24 14:32:15.000000000 +0200 -+++ a/zappilotosd.h 2015-10-22 18:40:02.000000000 +0200 -@@ -39,7 +39,7 @@ class cZappilotOsd : public cOsdObject - int offset; - int lines; - int type; -- cChannel* currentChannel; -+ const cChannel* currentChannel; - - public: - cZappilotOsd(void); diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild deleted file mode 100644 index 92cb1749d488..000000000000 --- a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -VERSION="1318" # every bump new version - -DESCRIPTION="VDR Plugin: browse fast the EPG information without being to switch to a channel" -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-zappilot"; -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" - -KEYWORDS="amd64 x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-1.7.34" -RDEPEND="${DEPEND}" - -src_prepare() { - vdr-plugin-2_src_prepare - - if has_version ">=media-video/vdr-2.3.1"; then - eapply "${FILESDIR}/${P}_vdr-2.3.1.patch" - fi -}
