diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-plugins/vdr-zappilot |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-plugins/vdr-zappilot')
-rw-r--r-- | media-plugins/vdr-zappilot/Manifest | 7 | ||||
-rw-r--r-- | media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch | 281 | ||||
-rw-r--r-- | media-plugins/vdr-zappilot/metadata.xml | 8 | ||||
-rw-r--r-- | media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild | 28 | ||||
-rw-r--r-- | media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild | 20 |
5 files changed, 344 insertions, 0 deletions
diff --git a/media-plugins/vdr-zappilot/Manifest b/media-plugins/vdr-zappilot/Manifest new file mode 100644 index 000000000000..359c6d5a99d1 --- /dev/null +++ b/media-plugins/vdr-zappilot/Manifest @@ -0,0 +1,7 @@ +AUX vdr-zappilot-0.0.5_vdr-2.3.1.patch 10468 SHA256 3208113551a7cb255e135816054b131fed470791eb1ca34ac850aaf6a0d74789 SHA512 568f77a33134667a013a7c9983a9887eb29d083b533cf226e94e95240d1b89f12c969f7257ff8d718e1c94fcbaa266b836bcf360d62cbff8bc28d3ce3468dcfc WHIRLPOOL ecb4bc33ce851f66b000f0ca8126026560edb73f37a6080afc476bdd23cb151f98d7a0738702f6068be98ba8f3d0a5c1e1ea886c2218b03056375d09ebd323a6 +DIST vdr-zappilot-0.0.5.tgz 17061 SHA256 d177520269499d8e2c68f99b9325f8b8823d9d4f5cc24e98fada742c76dff4e0 SHA512 9f1dfd3ecb38c5a4afdcad963f2680fe3c5e8dbe4610de0ccc8967811e51ca5e4ad268b9d01a5e4dd392ffa275bf896dd03225bc6568a72d92063a1dfa576222 WHIRLPOOL 650edd19153fa9299662bfb8f5560c9e1e8b687857bc0894b838d7397eacd2bcb740de8252d7ccba1cd667bdae35bb3636d7f57c719e94739847876bd795a9cb +EBUILD vdr-zappilot-0.0.5-r1.ebuild 663 SHA256 c56bd7cd5d1776258addebd8248fe011b180dce82e0dd43f8a1cbbdedb43da69 SHA512 e8c9fcf26313df02245cb174674ddf87a620b487b152db2f226a1ec62edd923e1304f12a3b0794b36711071131aab41cccb34273fc0c20585070e4f96a901827 WHIRLPOOL 6a9ba6f6b3646d2ad5a25c48534a9d0f9f863197c6e815ab49dcd71f09733db7dc677dabcdda5482aa2959392469286c8f959d352907557ebc21715980edba6a +EBUILD vdr-zappilot-0.0.5.ebuild 519 SHA256 9c9a741934ccc4e405c11dfb4bd1292aa265c286eb657e1f7a667baa6f86d1aa SHA512 84ac4970913f6fad065568781c461734e3b6b804f0051bde876d33133c05d9241cbb3f14d27ad1dda95fd77ba0012e473d6a45420a0def7d9bb5baf4d459d81d WHIRLPOOL 6e84479c6f12e84ad4205164cd1563f2ed1b0b0f70774bbed012973095d965d620099a9e7e8f0da3f2c22c869fb38f47956abdfcb1106295b2fba84a48c82f3c +MISC ChangeLog 3070 SHA256 3449b809f3c8000f4ceeea035e4bb5a7ea2cfd0b20baee380a942b83f2d12b3c SHA512 1f91cb83c2b9c6157f4512e803e452792dd1361211f1465d896d9ffa5b510d4168965bef37c49f3a6783b52247dd102175e2614c0f2c72d98b24afcea0b6ab6b WHIRLPOOL f66ccbeaa0bffc899421680ffd6a27783babe4bc42bcb3d741624c3f3ca3cd394ae677d1ba394f3d234f7acd5c4cfd56ab495e0d498c84039972138ae2be1dc9 +MISC ChangeLog-2015 967 SHA256 930f236058567f2a8173f40c69fd719a677b8fea5443a18cbcfa231cdc888a7c SHA512 44f766657ef1dfda6e4d3b01f53d4d8eb81decb167195700cf7ff2ec47061cf68b8034a65f1e057f8bf9b64c4799ff844e242a5a6742772efb14e5d711a61ab3 WHIRLPOOL 483c7f27cd44573b1ffda001ca6b9fbaeaab50bfd46585502f2c3cbed14d65b1bffae61fff16826dbcce974513902de46f07d06a15a874feb68321bfce1cac1b +MISC metadata.xml 243 SHA256 161359b6e9eddec137a431eea66785e070bbc25fab3ae1b57f900e411fc37fe7 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 WHIRLPOOL ebf59815181c251040396bb44206b875f6d996abcff030fdbf8355b47d6ea8c4f2669847ea1af194112de469258d7ca09ed77b682924ca495958a65f957dbf39 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 new file mode 100644 index 000000000000..4a6c4e25b68d --- /dev/null +++ b/media-plugins/vdr-zappilot/files/vdr-zappilot-0.0.5_vdr-2.3.1.patch @@ -0,0 +1,281 @@ +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 <hd_brummy@gentoo.org> (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/metadata.xml b/media-plugins/vdr-zappilot/metadata.xml new file mode 100644 index 000000000000..27f419c289c3 --- /dev/null +++ b/media-plugins/vdr-zappilot/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>vdr@gentoo.org</email> +<name>Gentoo VDR Project</name> +</maintainer> +</pkgmetadata> diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild new file mode 100644 index 000000000000..35f779376a81 --- /dev/null +++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit vdr-plugin-2 + +VERSION="1318" # every bump new version + +DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel" +HOMEPAGE="http://projects.vdr-developer.org/projects/show/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 + epatch "${FILESDIR}/${P}_vdr-2.3.1.patch" + fi +} diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild new file mode 100644 index 000000000000..75d1cf6bdd60 --- /dev/null +++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit vdr-plugin-2 + +VERSION="1318" # every bump new version + +DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel" +HOMEPAGE="http://projects.vdr-developer.org/projects/show/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}" |