From 70c8c7759652de72577f4580faf1637e325c21cc Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 15:32:36 +0200 Subject: [PATCH 1/8] Rebuilt for new VDR API version 2.7.2 --- vdr-osdteletext.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 56516d7..f9088cb 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -1,19 +1,21 @@ %global pname osdteletext %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.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.3.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: OSD teletext plugin for VDR -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://projects.vdr-developer.org/projects/show/plg-osdteletext +URL: https://github.com/vdr-projects/vdr-plugin-osdteletext Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf @@ -63,6 +65,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Wed Oct 09 2024 Martin Gansser - 2.3.1-17 +- Rebuilt for new VDR API version 2.7.2 + * Fri Jul 26 2024 Miroslav Suchý - 2.3.1-16 - convert license to SPDX From 42f090980fb1977897aa756541a1632406965020 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:12:28 +0000 Subject: [PATCH 2/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-osdteletext.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index f9088cb..0518806 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -11,7 +11,7 @@ Name: vdr-%{pname} Version: 2.3.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: OSD teletext plugin for VDR License: GPL-2.0-or-later @@ -65,6 +65,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.3.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 09 2024 Martin Gansser - 2.3.1-17 - Rebuilt for new VDR API version 2.7.2 From 7d776f89a90747c019aee7b04a42128f6933bf91 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 14:07:19 +0100 Subject: [PATCH 3/8] Rebuilt for new VDR API version 2.7.4 --- vdr-osdteletext.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 0518806..d5d17f8 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -1,17 +1,15 @@ %global pname osdteletext %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.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.3.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: OSD teletext plugin for VDR License: GPL-2.0-or-later @@ -65,6 +63,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Fri Feb 28 2025 Martin Gansser - 2.3.1-19 +- Rebuilt for new VDR API version 2.7.4 + * Sun Jan 19 2025 Fedora Release Engineering - 2.3.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3f57e057bc520ae284e84911a3b71f4037eeff8f Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:14:01 +0200 Subject: [PATCH 4/8] Rebuilt for new VDR API version 2.7.5 --- vdr-osdteletext.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index d5d17f8..355bc3b 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -1,15 +1,18 @@ %global pname osdteletext %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.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.3.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: OSD teletext plugin for VDR License: GPL-2.0-or-later @@ -63,6 +66,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Tue May 27 2025 Martin Gansser - 2.3.1-20 +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 2.3.1-19 - Rebuilt for new VDR API version 2.7.4 From e83465e8133d88d936b81cd817728f8d515b6074 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:29:31 +0200 Subject: [PATCH 5/8] Rebuilt for new VDR API version 2.7.6 --- vdr-osdteletext.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 355bc3b..a234331 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.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.3.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: OSD teletext plugin for VDR License: GPL-2.0-or-later @@ -66,6 +66,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Sat Jun 21 2025 Martin Gansser - 2.3.1-21 +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 2.3.1-20 - Rebuilt for new VDR API version 2.7.5 From dc95d7d3fd486236ad4b9d95fe1db6d8588cf27c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 7 Jul 2025 09:17:15 +0200 Subject: [PATCH 6/8] Update to last git release 2.3.2-0.1.20211217gitcae4629 Add Fix_DrawMessage.patch --- .gitignore | 1 + Fix_DrawMessage.patch | 16 ++++++++++++++++ sources | 2 +- vdr-osdteletext.spec | 23 ++++++++++++++++++----- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 Fix_DrawMessage.patch diff --git a/.gitignore b/.gitignore index a672b7d..5c61683 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /vdr-osdteletext-2.2.1.tar.gz /vdr-osdteletext-2.3.0.tar.gz /vdr-osdteletext-2.3.1.tar.gz +/vdr-osdteletext-2.3.2-cae4629.tar.gz diff --git a/Fix_DrawMessage.patch b/Fix_DrawMessage.patch new file mode 100644 index 0000000..c991cec --- /dev/null +++ b/Fix_DrawMessage.patch @@ -0,0 +1,16 @@ + displaybase.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/displaybase.c b/displaybase.c +index 969c55e..61170ed 100644 +--- a/displaybase.c ++++ b/displaybase.c +@@ -1079,7 +1079,7 @@ void cDisplay::DrawMessage(const char *txt1, const char *txt2, const cString *tx + }; + + // Draw text array in frame color +- if ((txtArray != NULL) && (txtArrayEntries > 0) && (txtArrayColumns > 0)) { ++ if (txtArrayActive) { + DEBUG_OT_MSG("txtArray draw txtArrayEntries=%d txtArrayColumns=%d ca=%d cl=%d", txtArrayEntries, txtArrayColumns, ca, cl); + int c = 0; + int xa = 0; diff --git a/sources b/sources index 6b414a9..86aaca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-osdteletext-2.3.1.tar.gz) = 1ffeebd35693a6fb41fd0c422e86ec2fdf4dfce5ffbdabd3da65421e50e390c68d9c0a38d5fca8bc65ff65bc2e4d529e520ea52ee304659cde2a337b3bce4a48 +SHA512 (vdr-osdteletext-2.3.2-cae4629.tar.gz) = cf52007a011130b9363550da57af26901157159ef2f79976ec090ed537e8873bac3b8b95dcd5265134321a26ded8a20c9c1939393a8530c89ecbac7e3a8a85db diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index a234331..6cc711e 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -1,6 +1,10 @@ %global pname osdteletext %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$ +%global commit0 cae4629f84886015b0619af6fdb1084853b80f93 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global gitdate 20211217 + # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 %global vdr_version 2.7.6 @@ -11,14 +15,18 @@ %endif Name: vdr-%{pname} -Version: 2.3.1 -Release: 21%{?dist} +Version: 2.3.2 +Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +# Release: 21%%{?dist} Summary: OSD teletext plugin for VDR License: GPL-2.0-or-later URL: https://github.com/vdr-projects/vdr-plugin-osdteletext -Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +# Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz Source1: %{name}.conf +# https://www.vdr-portal.de/forum/thread/136886-gel%%C3%%B6st-vdr-startet-nicht-mehr-mit-aktivem-vdr-osdteletext-plugin/?postID=1382554#post1382554 +Patch0: Fix_DrawMessage.patch BuildRequires: make BuildRequires: gcc-c++ @@ -32,7 +40,8 @@ display, with sound and video from the current channel playing in the background. %prep -%autosetup -p1 -n vdr-plugin-%{pname}-%{version} +#%%autosetup -p1 -n vdr-plugin-%%{pname}-%%{version} +%autosetup -p1 -n vdr-plugin-%{pname}-%{commit0} sed -i -e 's|/var/cache/vdr/vtx|%{vdr_rundir}/%{pname}|g' \ osdteletext.c README README.DE rootdir.c @@ -66,6 +75,10 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Fri Jul 04 2025 Martin Gansser - 2.3.2-0.1.20211217gitcae4629 +- Update to last git release 2.3.2-0.1.20211217gitcae4629 +- Add Fix_DrawMessage.patch + * Sat Jun 21 2025 Martin Gansser - 2.3.1-21 - Rebuilt for new VDR API version 2.7.6 @@ -211,7 +224,7 @@ install -Dpm 644 teletext2.ttf \ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Sun May 06 2018 Martin Gansser - 0.9.7-3 -- Add %{pname}-4bpp.diff +- Add %%{pname}-4bpp.diff * Sun Apr 29 2018 Martin Gansser - 0.9.7-2 - Add %%{pname}-%%{version}.patch From 7ce3c5774b378ec5c7ddd712bff0f0c06c7bc73d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:01:06 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-osdteletext.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 6cc711e..6b75240 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -16,7 +16,7 @@ Name: vdr-%{pname} Version: 2.3.2 -Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} # Release: 21%%{?dist} Summary: OSD teletext plugin for VDR @@ -75,6 +75,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.2-0.2.20211217gitcae4629 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 04 2025 Martin Gansser - 2.3.2-0.1.20211217gitcae4629 - Update to last git release 2.3.2-0.1.20211217gitcae4629 - Add Fix_DrawMessage.patch From 42b3485eab0191688322752a8b90823ae381eff0 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:52:03 +0200 Subject: [PATCH 8/8] Rebuilt for new VDR API version 2.7.7 --- vdr-osdteletext.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 6b75240..c46322a 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -7,7 +7,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 @@ -16,7 +16,7 @@ Name: vdr-%{pname} Version: 2.3.2 -Release: 0.2.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.3.%{gitdate}git%{shortcommit0}%{?dist} # Release: 21%%{?dist} Summary: OSD teletext plugin for VDR @@ -75,6 +75,9 @@ install -Dpm 644 teletext2.ttf \ %attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/ %changelog +* Fri Jul 25 2025 Martin Gansser - 2.3.2-0.3.20211217gitcae4629 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 2.3.2-0.2.20211217gitcae4629 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild