diff --git a/0002-femon-Removal-of-deprecated-interface-functions.patch b/0002-femon-Removal-of-deprecated-interface-functions.patch deleted file mode 100644 index 053dfcc..0000000 --- a/0002-femon-Removal-of-deprecated-interface-functions.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 f0123a3..cb8b0af 100644 --- a/vdr-femon.spec +++ b/vdr-femon.spec @@ -1,26 +1,20 @@ %global pname femon %global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ - -# Set vdr_version based on Fedora version -%if 0%{?fedora} >= 43 -%global vdr_version 2.7.7 -%elif 0%{?fedora} == 42 -%global vdr_version 2.7.4 -%else +# version we want build against +%global vdr_version 2.6.3 +%if 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-%{pname} Version: 2.4.0 -Release: 37%{?dist} +Release: 28%{?dist} Summary: DVB frontend status monitor plugin for VDR -License: GPL-2.0-or-later +License: GPLv2+ 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 @@ -53,34 +47,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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