From f10c77aa4662a59e3ccf824b20568ee833915977 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:38:36 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-femon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index cb8b0af..f00f2f3 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -8,7 +8,7 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPLv2+ URL: https://github.com/rofafor/vdr-plugin-femon @@ -47,6 +47,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.4.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 2.4.0-28 - Rebuilt for new VDR API version 2.6.9 From 9b2c7bac4c5fa1a446e69ec232f422554c05232c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:32:23 +0200 Subject: [PATCH 02/10] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-femon.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index f00f2f3..e4eef59 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -8,9 +8,10 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: DVB frontend status monitor plugin for VDR -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon Source0: %url/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf @@ -47,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.4.0-30 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.4.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6f3848f6fd4cbcc0a27b88f41045f0d01e44046c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 14:19:19 +0200 Subject: [PATCH 03/10] Rebuilt for new VDR API version 2.7.2 Add 0002-femon-Removal-of-deprecated-interface-functions.patch --- ...al-of-deprecated-interface-functions.patch | 38 +++++++++++++++++++ vdr-femon.spec | 16 ++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 0002-femon-Removal-of-deprecated-interface-functions.patch diff --git a/0002-femon-Removal-of-deprecated-interface-functions.patch b/0002-femon-Removal-of-deprecated-interface-functions.patch new file mode 100644 index 0000000..053dfcc --- /dev/null +++ b/0002-femon-Removal-of-deprecated-interface-functions.patch @@ -0,0 +1,38 @@ +From 5d4b227597ae8346dec5a9d5d7085f9a1686c6a1 Mon Sep 17 00:00:00 2001 +From: Stefan Hofmann +Date: Mon, 9 Sep 2024 18:07:45 +0200 +Subject: [PATCH] Catered for the removal of deprecated interface functions + +--- + femon.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/femon.c b/femon.c +index a368b3f..7925192 100644 +--- a/femon.c ++++ b/femon.c +@@ -120,8 +120,21 @@ cOsdObject *cPluginFemon::MainMenuAction(void) + { + // Perform the action when selected from the main VDR menu. + debug1("%s", __PRETTY_FUNCTION__); ++#if APIVERSNUM >= 20402 ++ bool isPlaying; ++ bool noChannels; ++ { // minimal scope to avoid potential deadlock with two mutexes ++ cMutexLock mutexLock; ++ isPlaying = cControl::Control(mutexLock); ++ }{ ++ LOCK_CHANNELS_READ; ++ noChannels = Channels->Count() <= 0; ++ } ++ if (isPlaying || noChannels) ++#else + LOCK_CHANNELS_READ; + if (cControl::Control() || (Channels->Count() <= 0)) ++#endif + Skins.Message(mtInfo, tr("Femon not available")); + else + return cFemonOsd::Instance(true); +-- +2.46.0.windows.1 + diff --git a/vdr-femon.spec b/vdr-femon.spec index e4eef59..d4a4d4b 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -1,21 +1,25 @@ %global pname femon %global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ -# version we want build against +# version we want to build against %global vdr_version 2.6.3 -%if 0%{?fedora} >= 40 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 42 +%global vdr_version 2.7.2 +%elif 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 2.4.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: DVB frontend status monitor plugin for VDR -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon Source0: %url/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf Patch0: %{name}-gcc11.patch +# https://www.vdr-portal.de/index.php?attachment/49666-0002-femon-removal-of-deprecated-interface-functions-zip/ +Patch1: 0002-femon-Removal-of-deprecated-interface-functions.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gettext @@ -48,6 +52,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Wed Oct 09 2024 Martin Gansser - 2.4.0-31 +- Rebuilt for new VDR API version 2.7.2 +- Add 0002-femon-Removal-of-deprecated-interface-functions.patch + * Fri Jul 26 2024 Miroslav Suchý - 2.4.0-30 - convert license to SPDX From c2744d0b1d36daf2316e695d09d08f934a6b0ec1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:11:30 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-femon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index d4a4d4b..235e5b3 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -11,7 +11,7 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -52,6 +52,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.4.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 09 2024 Martin Gansser - 2.4.0-31 - Rebuilt for new VDR API version 2.7.2 - Add 0002-femon-Removal-of-deprecated-interface-functions.patch From 128ba26b286cdf618aad7fa9271e7186c65a4235 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 10:52:04 +0100 Subject: [PATCH 05/10] Rebuilt for new VDR API version 2.7.4 --- vdr-femon.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 235e5b3..0b26511 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -1,17 +1,15 @@ %global pname femon %global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ # version we want to build against -%global vdr_version 2.6.3 +%global vdr_version 2.6.9 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 42 -%global vdr_version 2.7.2 -%elif 0%{?fedora} >= 40 -%global vdr_version 2.6.9 +%global vdr_version 2.7.4 %endif Name: vdr-%{pname} Version: 2.4.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -52,8 +50,11 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Fri Feb 28 2025 Martin Gansser - 2.4.0-33 +- Rebuilt for new VDR API version 2.7.4 + * Sun Jan 19 2025 Fedora Release Engineering - 2.4.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuil * Wed Oct 09 2024 Martin Gansser - 2.4.0-31 - Rebuilt for new VDR API version 2.7.2 From 41fda817ffc71f40af6c2780e787cc7628e55c69 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 10:53:05 +0100 Subject: [PATCH 06/10] Rebuilt for new VDR API version 2.7.4 --- vdr-femon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 0b26511..050d824 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -54,7 +54,7 @@ install -Dpm 644 %{SOURCE1} \ - Rebuilt for new VDR API version 2.7.4 * Sun Jan 19 2025 Fedora Release Engineering - 2.4.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuil +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild * Wed Oct 09 2024 Martin Gansser - 2.4.0-31 - Rebuilt for new VDR API version 2.7.2 From 5741cbbb9599045cbcfad178e7ba5435d02a8fe8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:08:50 +0200 Subject: [PATCH 07/10] Rebuilt for new VDR API version 2.7.5 --- vdr-femon.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 050d824..696fc9d 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -1,15 +1,18 @@ %global pname femon %global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ -# version we want to build against -%global vdr_version 2.6.9 + # Set vdr_version based on Fedora version -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.5 +%elif 0%{?fedora} == 42 %global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 2.4.0 -Release: 33%{?dist} +Release: 34%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -50,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Tue May 27 2025 Martin Gansser - 2.4.0-34 +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 2.4.0-33 - Rebuilt for new VDR API version 2.7.4 From eef4eb314b2e70c982e7d6c461346dc541ebc366 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:24:26 +0200 Subject: [PATCH 08/10] Rebuilt for new VDR API version 2.7.6 --- vdr-femon.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 696fc9d..2eecd25 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -3,7 +3,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.5 +%global vdr_version 2.7.6 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -12,7 +12,7 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 34%{?dist} +Release: 35%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Sat Jun 21 2025 Martin Gansser - 2.4.0-35 +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 2.4.0-34 - Rebuilt for new VDR API version 2.7.5 From 41e84defd824cc976efd7a89d7e9db823c54f29e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:00:36 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-femon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 2eecd25..8c73ba7 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -12,7 +12,7 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 35%{?dist} +Release: 36%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.4.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jun 21 2025 Martin Gansser - 2.4.0-35 - Rebuilt for new VDR API version 2.7.6 From 87ed4725ef30d31981541f5e692d7259681d0f5c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:30:31 +0200 Subject: [PATCH 10/10] Rebuilt for new VDR API version 2.7.7 --- vdr-femon.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-femon.spec b/vdr-femon.spec index 8c73ba7..f0123a3 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -3,7 +3,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.6 +%global vdr_version 2.7.7 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -12,7 +12,7 @@ Name: vdr-%{pname} Version: 2.4.0 -Release: 36%{?dist} +Release: 37%{?dist} Summary: DVB frontend status monitor plugin for VDR License: GPL-2.0-or-later URL: https://github.com/rofafor/vdr-plugin-femon @@ -53,6 +53,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %changelog +* Fri Jul 25 2025 Martin Gansser - 2.4.0-37 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 2.4.0-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild