| 1 |
commit: 8d4668bf7b71f04fa5022e097435e8c7df51ac0b |
| 2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 25 23:29:24 2019 +0000 |
| 4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 25 23:30:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4668bf |
| 7 |
|
| 8 |
media-plugins/vdr-epgsync: compile fix for media-video/vdr-2.4 |
| 9 |
|
| 10 |
need >=media-video/vdr-2.4 |
| 11 |
moved to eapi 7 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.83, Repoman-2.3.18 |
| 14 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/vdr-epgsync-1.0.1_vdr-2.4.patch | 56 ++++++++++++++++++++++ |
| 17 |
...nc-1.0.1.ebuild => vdr-epgsync-1.0.1-r1.ebuild} | 12 ++--- |
| 18 |
media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild | 4 +- |
| 19 |
3 files changed, 64 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch b/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..9b3df4097fd |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch |
| 26 |
@@ -0,0 +1,56 @@ |
| 27 |
+compilefix for media-video/vdr-2.4.1 |
| 28 |
+Suggested-by: MatthiasK @ vdr-portal.de |
| 29 |
+ |
| 30 |
+Signed-off-by: Joerg Bornkessel <hd_brummy@g.o> ( 27 Dec 2019 ) |
| 31 |
+diff -Naur epgsync-1.0.1.orig/thread.c epgsync-1.0.1/thread.c |
| 32 |
+--- epgsync-1.0.1.orig/thread.c 2019-12-26 00:12:49.124492713 +0100 |
| 33 |
++++ epgsync-1.0.1/thread.c 2019-12-26 00:17:55.129492713 +0100 |
| 34 |
+@@ -42,9 +42,10 @@ |
| 35 |
+ } |
| 36 |
+ } |
| 37 |
+ |
| 38 |
+-cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll) |
| 39 |
++const cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll) |
| 40 |
+ { |
| 41 |
+- for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { |
| 42 |
++ LOCK_CHANNELS_READ; |
| 43 |
++ for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) { |
| 44 |
+ if (strcasecmp(Name, channel->Name()) == 0 || strcasecmp(Name, channel->ShortName()) == 0) { |
| 45 |
+ if (IsType(channel, Type) && channel != IgnoreChannel) |
| 46 |
+ return channel; |
| 47 |
+@@ -95,20 +96,17 @@ |
| 48 |
+ if (EpgSyncSetup.redirectChannels == rcmId) { |
| 49 |
+ // Direct import, no mapping: |
| 50 |
+ // loop through local channels, get channels by ID |
| 51 |
+- cSchedulesLock *lock = NULL; |
| 52 |
+- for (cChannel *channel = Channels.First(); channel && Running(); |
| 53 |
+- channel = Channels.Next(channel)) { |
| 54 |
+- if (!lock) |
| 55 |
+- lock = new cSchedulesLock(); |
| 56 |
+- if (cSchedules::Schedules(*lock)->GetSchedule(channel)) { |
| 57 |
+- DELETENULL(lock); |
| 58 |
++ LOCK_CHANNELS_READ; |
| 59 |
++ for (const cChannel *channel = Channels->First(); channel && Running(); |
| 60 |
++ channel = Channels->Next(channel)) { |
| 61 |
++ LOCK_SCHEDULES_READ; |
| 62 |
++ if (Schedules->GetSchedule(channel)) { |
| 63 |
+ if (CmdLSTE(f, *channel->GetChannelID().ToString())) { |
| 64 |
+ AddSchedule(f); |
| 65 |
+ } |
| 66 |
+ cCondWait::SleepMs(EPGSYNC_SLEEPMS); |
| 67 |
+ } |
| 68 |
+ } |
| 69 |
+- DELETENULL(lock); |
| 70 |
+ } |
| 71 |
+ else { |
| 72 |
+ // Map channels by name: |
| 73 |
+@@ -182,7 +180,8 @@ |
| 74 |
+ targetChannel = NULL; |
| 75 |
+ |
| 76 |
+ const char* p = skipspace(s + 1); |
| 77 |
+- cChannel *c = Channels.GetByChannelID(tChannelID::FromString(p)); |
| 78 |
++ LOCK_CHANNELS_READ; |
| 79 |
++ const cChannel *c = Channels->GetByChannelID(tChannelID::FromString(p)); |
| 80 |
+ bool cOk = IsType(c, (eChannelTypes) EpgSyncSetup.channelTypes); |
| 81 |
+ |
| 82 |
+ if (cOk && EpgSyncSetup.redirectChannels != rcmNameId) { |
| 83 |
|
| 84 |
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild |
| 85 |
similarity index 65% |
| 86 |
copy from media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild |
| 87 |
copy to media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild |
| 88 |
index 1adc7607169..12631b5c4ec 100644 |
| 89 |
--- a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild |
| 90 |
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild |
| 91 |
@@ -1,7 +1,7 @@ |
| 92 |
-# Copyright 1999-2016 Gentoo Foundation |
| 93 |
+# Copyright 1999-2019 Gentoo Authors |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
|
| 96 |
-EAPI=5 |
| 97 |
+EAPI=7 |
| 98 |
|
| 99 |
inherit vdr-plugin-2 |
| 100 |
|
| 101 |
@@ -11,8 +11,8 @@ SRC_URI="http://vdr.schmirler.de/epgsync/${P}.tgz" |
| 102 |
|
| 103 |
SLOT="0" |
| 104 |
LICENSE="GPL-2" |
| 105 |
-KEYWORDS="amd64 ~arm x86" |
| 106 |
-IUSE="" |
| 107 |
+KEYWORDS="~amd64 ~arm ~x86" |
| 108 |
|
| 109 |
-DEPEND=">=media-video/vdr-2.0.0" |
| 110 |
-RDEPEND="${DEPEND}" |
| 111 |
+DEPEND=">=media-video/vdr-2.4" |
| 112 |
+ |
| 113 |
+PATCHES=( "${FILESDIR}/${P}_vdr-2.4.patch" ) |
| 114 |
|
| 115 |
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild |
| 116 |
index 1adc7607169..f473895f04a 100644 |
| 117 |
--- a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild |
| 118 |
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild |
| 119 |
@@ -1,7 +1,7 @@ |
| 120 |
-# Copyright 1999-2016 Gentoo Foundation |
| 121 |
+# Copyright 1999-2019 Gentoo Authors |
| 122 |
# Distributed under the terms of the GNU General Public License v2 |
| 123 |
|
| 124 |
-EAPI=5 |
| 125 |
+EAPI=7 |
| 126 |
|
| 127 |
inherit vdr-plugin-2 |
Archives