From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8DA515817D for ; Sat, 22 Jun 2024 18:54:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61A442BC0A1; Sat, 22 Jun 2024 18:54:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 450272BC0A1 for ; Sat, 22 Jun 2024 18:54:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E1D5340806 for ; Sat, 22 Jun 2024 18:54:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C1361D4E for ; Sat, 22 Jun 2024 18:54:36 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1719082239.a1b4b0387b19a1d4385c316fab6b05579d96b7f7.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsync/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch X-VCS-Directories: media-plugins/vdr-epgsync/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: a1b4b0387b19a1d4385c316fab6b05579d96b7f7 X-VCS-Branch: master Date: Sat, 22 Jun 2024 18:54:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7aa149da-b236-476e-915c-703e71eae9f9 X-Archives-Hash: 4b7570acaae37dfcdb6a6c163545222b commit: a1b4b0387b19a1d4385c316fab6b05579d96b7f7 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 18 17:24:45 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jun 22 18:50:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b4b038 media-plugins/vdr-epgsync: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/vdr-epgsync-1.0.1_vdr-2.4.patch | 56 ---------------------- 1 file changed, 56 deletions(-) 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 deleted file mode 100644 index 9b3df4097fd4..000000000000 --- a/media-plugins/vdr-epgsync/files/vdr-epgsync-1.0.1_vdr-2.4.patch +++ /dev/null @@ -1,56 +0,0 @@ -compilefix for media-video/vdr-2.4.1 -Suggested-by: MatthiasK @ vdr-portal.de - -Signed-off-by: Joerg Bornkessel ( 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) {