Compare commits

...
Sign in to create a new pull request.

10 commits

Author SHA1 Message Date
Martin Gansser
87ed4725ef Rebuilt for new VDR API version 2.7.7 2025-07-27 18:30:31 +02:00
Fedora Release Engineering
41e84defd8 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:00:36 +00:00
Martin Gansser
eef4eb314b Rebuilt for new VDR API version 2.7.6 2025-06-22 12:24:26 +02:00
Martin Gansser
5741cbbb95 Rebuilt for new VDR API version 2.7.5 2025-05-27 17:08:50 +02:00
Martin Gansser
41fda817ff Rebuilt for new VDR API version 2.7.4 2025-02-28 10:53:05 +01:00
Martin Gansser
128ba26b28 Rebuilt for new VDR API version 2.7.4 2025-02-28 10:52:04 +01:00
Fedora Release Engineering
c2744d0b1d Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:11:30 +00:00
Martin Gansser
6f3848f6fd Rebuilt for new VDR API version 2.7.2
Add 0002-femon-Removal-of-deprecated-interface-functions.patch
2024-10-09 14:19:19 +02:00
Miroslav Suchý
9b2c7bac4c convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:32:23 +02:00
Fedora Release Engineering
f10c77aa46 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:38:36 +00:00
2 changed files with 77 additions and 5 deletions

View file

@ -0,0 +1,38 @@
From 5d4b227597ae8346dec5a9d5d7085f9a1686c6a1 Mon Sep 17 00:00:00 2001
From: Stefan Hofmann <stefan.hofmann@t-online.de>
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

View file

@ -1,20 +1,26 @@
%global pname femon
%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$
# version we want build against
%global vdr_version 2.6.3
%if 0%{?fedora} >= 40
# 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
%global vdr_version 2.6.9
%endif
Name: vdr-%{pname}
Version: 2.4.0
Release: 28%{?dist}
Release: 37%{?dist}
Summary: DVB frontend status monitor plugin for VDR
License: GPLv2+
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
@ -47,6 +53,34 @@ install -Dpm 644 %{SOURCE1} \
%{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion}
%changelog
* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.4.0-37
- Rebuilt for new VDR API version 2.7.7
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.4.0-35
- Rebuilt for new VDR API version 2.7.6
* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.4.0-34
- Rebuilt for new VDR API version 2.7.5
* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.4.0-33
- Rebuilt for new VDR API version 2.7.4
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 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ý <msuchy@redhat.com> - 2.4.0-30
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.4.0-28
- Rebuilt for new VDR API version 2.6.9