diff --git a/.gitignore b/.gitignore index 112c2e6..5c61683 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,18 @@ /*.tgz /vdr-osdteletext-0.9.8.tar.gz +/vdr-osdteletext-1.0.0.tar.gz +/vdr-osdteletext-1.0.5.tar.gz +/vdr-osdteletext-1.0.6.tar.gz +/vdr-osdteletext-1.0.7.tar.gz +/vdr-osdteletext-1.1.0.tar.gz +/vdr-osdteletext-1.1.1.tar.gz +/vdr-osdteletext-2.0.0.tar.gz +/vdr-osdteletext-2.0.1.tar.gz +/vdr-osdteletext-2.0.2.tar.gz +/vdr-osdteletext-2.1.0.tar.gz +/vdr-osdteletext-2.1.1.tar.gz +/vdr-osdteletext-2.2.0.tar.gz +/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 e47447e..86aaca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-osdteletext-0.9.8.tar.gz) = 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58 +SHA512 (vdr-osdteletext-2.3.2-cae4629.tar.gz) = cf52007a011130b9363550da57af26901157159ef2f79976ec090ed537e8873bac3b8b95dcd5265134321a26ded8a20c9c1939393a8530c89ecbac7e3a8a85db diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index f54b399..c46322a 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -1,19 +1,37 @@ %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.7 +%elif 0%{?fedora} == 42 +%global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 +%endif + Name: vdr-%{pname} -Version: 0.9.8 -Release: 1%{?dist} +Version: 2.3.2 +Release: 0.3.%{gitdate}git%{shortcommit0}%{?dist} +# Release: 21%%{?dist} Summary: OSD teletext plugin for VDR -License: GPLv2+ -URL: http://projects.vdr-developer.org/projects/show/plg-osdteletext -Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +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/%{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++ -BuildRequires: vdr-devel >= 1.7.39 +BuildRequires: gettext +BuildRequires: vdr-devel >= %{vdr_version} Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} %description @@ -21,41 +39,166 @@ The OSD teletext plugin displays teletext directly on VDR's on-screen 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 - %build %make_build - %install %make_install install -dm 755 $RPM_BUILD_ROOT%{vdr_rundir}/%{pname} install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fonts/vdr%{pname} echo "d %{vdr_rundir}/%{pname} 0755 %{vdr_user} root -" > \ $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf -%find_lang %{name} +install -Dpm 644 teletext2.ttf \ + $RPM_BUILD_ROOT%{_datadir}/fonts/vdr%{pname}/teletext2.ttf +%find_lang %{name} %files -f %{name}.lang %license COPYING %doc HISTORY README* %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf +%{_datadir}/fonts/vdrosdteletext/teletext2.ttf %{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion} %{_prefix}/lib/tmpfiles.d/%{name}.conf %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 + +* 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 + +* 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 + +* 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 + +* Fri Jul 26 2024 Miroslav Suchý - 2.3.1-16 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.3.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Martin Gansser - 2.3.1-14 +- Rebuilt for new VDR API version 2.6.9 + +* Fri Jul 12 2024 Martin Gansser - 2.3.1-13 +- Rebuilt for new VDR API version 2.6.8 + +* Fri Apr 12 2024 Martin Gansser - 2.3.1-12 +- Rebuilt for new VDR API version + +* Fri Jan 26 2024 Martin Gansser - 2.3.1-11 +- Rebuilt for new VDR API version + +* Fri Jan 05 2024 Martin Gansser - 2.3.1-10 +- Rebuilt for new VDR API version +- Add BR gettext for rawhide + +* Sat Jul 22 2023 Fedora Release Engineering - 2.3.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 14 2022 Martin Gansser - 2.3.1-7 +- Rebuilt for new VDR API version + +* Thu Dec 01 2022 Martin Gansser - 2.3.1-6 +- Rebuilt for new VDR API version + +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Feb 04 2022 Martin Gansser - 2.3.1-4 +- Rebuilt for new VDR API version + +* Sat Jan 22 2022 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 30 2021 Martin Gansser - 2.3.1-2 +- Rebuilt for new VDR API version + +* Mon Dec 20 2021 Martin Gansser - 2.3.1-1 +- Update to 2.3.1 + +* Mon Dec 13 2021 Martin Gansser - 2.3.0-1 +- Update to 2.3.0 + +* Wed Aug 11 2021 Martin Gansser - 2.2.1-1 +- Update to 2.2.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun May 30 2021 Martin Gansser - 2.2.0-1 +- Update to 2.2.0 + +* Thu Apr 29 2021 Martin Gansser - 2.1.1-1 +- Update to 2.1.1 + +* Sat Apr 24 2021 Martin Gansser - 2.1.0-1 +- Use correct release tag for 2.1.0 + +* Wed Apr 14 2021 Martin Gansser - 2.0.2-2 +- Use correct release tag for 2.0.2 + +* Wed Apr 14 2021 Martin Gansser - 2.0.2-1 +- Update to 2.0.2 + +* Tue Apr 13 2021 Martin Gansser - 2.0.1-1 +- Update to 2.0.1 + +* Mon Apr 12 2021 Martin Gansser - 2.0.0-1 +- Update to 2.0.0 + +* Thu Apr 01 2021 Martin Gansser - 1.1.1-1 +- Update to 1.1.1 + +* Fri Mar 26 2021 Martin Gansser - 1.1.0-1 +- Update to 1.1.0 + +* Wed Mar 17 2021 Martin Gansser - 1.0.7-1 +- Update to 1.0.7 + +* Sun Feb 28 2021 Martin Gansser - 1.0.6-1 +- Add teletext2.ttf font in order to render special graphics characters properly + fixes (BZ#1933480) +- Update to 1.0.6 + +* Sun Feb 28 2021 Martin Gansser - 1.0.5-1 +- Update to 1.0.5 + +* Thu Feb 25 2021 Martin Gansser - 1.0.0-1 +- Update to 1.0.0 + * Tue Feb 02 2021 Martin Gansser - 0.9.8-1 - Update to 0.9.8 @@ -87,7 +230,7 @@ install -Dpm 644 %{SOURCE1} \ - 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