gentoo resync : 15.01.2020

4 files changed, 79 insertions, 3 deletions

diff --git a/media-plugins/vdr-epgsync/Manifest b/media-plugins/vdr-epgsync/Manifest
index 05c1e86ebd22..9f051cf70e84 100644
--- a/media-plugins/vdr-epgsync/Manifest
+++ b/media-plugins/vdr-epgsync/Manifest
@@ -1,3 +1,5 @@
+AUX vdr-epgsync-1.0.1_vdr-2.4.patch 2244 BLAKE2B 76f1a631d4bdc0c86121b96ac23d08c3b691c0152a6238e392a9308b0220e9cf7acd04ffa23fcb7d509191f0d9ab31ddc6e64acf603ca491ae459ad1f6ce34f6 SHA512 0e8558222090dc2248c7c96798523a69988738a4e28d0aed24f93a4b8eb197d220227896fa364ccf5c029666164a4a2a51876794d53c0a6e8c4bee9f89d3f4f5
 DIST vdr-epgsync-1.0.1.tgz 18198 BLAKE2B 0c2d782253d9c48a59e2dcf8cb58295b92d5c8b9384d947659b760c1f6b68c9b63c10ca4bccf5ae767d7499ea934f321edd4cc9c600f8da746781bc3a050b84d SHA512 1c9d1220460031a7dd22f8a8131c291bf9c66847be33c2a57464c29d7ed4b2297d6bda04c3ea0a24e3f00d5afe040d9236c5f9ef9f4389878906abc54466de18
-EBUILD vdr-epgsync-1.0.1.ebuild 416 BLAKE2B f168af37c07c0abcdff76aa97f4f9ff5a17e24824af43527c4ea62da5ad254d3b2c0469423c1d061dfea6509d483531ca99b87bd643c368cae8a9dcc7c0b0b58 SHA512 37437f487f6b02ae6665306d493c590ada2e7e35960602126162e4a3b3f3bb4f270a457ccbada7cc8e52df067d4e2ea59a4a2d1404ca2a4d72d38715bedc12c6
+EBUILD vdr-epgsync-1.0.1-r1.ebuild 431 BLAKE2B 4a79ae59d5149bbc7f057dc8256319ff0ba1ff92439f33b515441bf9ec4148fd63cb961106dd0134864a39f8a9c72ac25f0f0bf997b1bf931a47a0814f7cfb49 SHA512 2d21526ee05b65a9e0ef749ef0b15350919e82956ff3356e2b6f8d7523864cba6e765c4bb125767cf73a3a3ea58513b47c0fcf5d6e69cb86da6286941cdd66ff
+EBUILD vdr-epgsync-1.0.1.ebuild 413 BLAKE2B b60b73e5fac81790e228cf3139c17517d0e3b32ffabb30fe4466682a6921afb8d0f0879687977fa1031071d26efec645ad639d88e134f7b3fd9a1866693e4761 SHA512 c5fd54121d0cb0c4f8246a920ab6fa4cbe3ca804f03bc4b6c601702f589b7f9282d376657284b0e9bf9f5e5ee0ab5179e027223508bee5d31e7b8de2c7a55fad
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
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
new file mode 100644
index 000000000000..9b3df4097fd4
--- /dev/null
+++ b/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch
@@ -0,0 +1,56 @@
+compilefix for media-video/vdr-2.4.1
+Suggested-by: MatthiasK @ vdr-portal.de
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 27 Dec 2019 )
+diff -Naur epgsync-1.0.1.orig/thread.c epgsync-1.0.1/thread.c
+--- epgsync-1.0.1.orig/thread.c	2019-12-26 00:12:49.124492713 +0100
++++ epgsync-1.0.1/thread.c	2019-12-26 00:17:55.129492713 +0100
+@@ -42,9 +42,10 @@
+ 	}
+ }
+ 
+-cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll)
++const cChannel *GetChannelByName(const char* Name, const cChannel *IgnoreChannel = NULL, eChannelTypes Type = ctAll)
+ {
+-	for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
++	LOCK_CHANNELS_READ;
++	for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) {
+ 		if (strcasecmp(Name, channel->Name()) == 0 || strcasecmp(Name, channel->ShortName()) == 0) {
+ 			if (IsType(channel, Type) && channel != IgnoreChannel)
+ 				return channel;
+@@ -95,20 +96,17 @@
+ 		if (EpgSyncSetup.redirectChannels == rcmId) {
+ 			// Direct import, no mapping:
+ 			// loop through local channels, get channels by ID
+-			cSchedulesLock *lock = NULL;
+-			for (cChannel *channel = Channels.First(); channel && Running();
+-					channel = Channels.Next(channel)) {
+-				if (!lock)
+-					lock = new cSchedulesLock();
+-				if (cSchedules::Schedules(*lock)->GetSchedule(channel)) {
+-					DELETENULL(lock);
++			LOCK_CHANNELS_READ;
++			for (const cChannel *channel = Channels->First(); channel && Running();
++					channel = Channels->Next(channel)) {
++			LOCK_SCHEDULES_READ;
++				if (Schedules->GetSchedule(channel)) {
+ 					if (CmdLSTE(f, *channel->GetChannelID().ToString())) {
+ 						AddSchedule(f);
+ 					}
+ 					cCondWait::SleepMs(EPGSYNC_SLEEPMS);
+ 				}
+ 			}
+-			DELETENULL(lock);
+ 		}
+ 		else {
+ 			// Map channels by name:
+@@ -182,7 +180,8 @@
+ 			targetChannel = NULL;
+ 
+ 			const char* p = skipspace(s + 1);
+-			cChannel *c = Channels.GetByChannelID(tChannelID::FromString(p));
++			LOCK_CHANNELS_READ;
++			const cChannel *c = Channels->GetByChannelID(tChannelID::FromString(p));
+ 			bool cOk = IsType(c, (eChannelTypes) EpgSyncSetup.channelTypes);
+ 
+ 			if (cOk && EpgSyncSetup.redirectChannels != rcmNameId) {
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..12631b5c4ecd
--- /dev/null
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Import the EPG of another VDR via vdr-svdrpservice"
+HOMEPAGE="http://vdr.schmirler.de/"
+SRC_URI="http://vdr.schmirler.de/epgsync/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+PATCHES=( "${FILESDIR}/${P}_vdr-2.4.patch" )
diff --git a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
index 1adc76071695..f473895f04ab 100644
--- a/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
+++ b/media-plugins/vdr-epgsync/vdr-epgsync-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2