Compare commits

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

25 commits

Author SHA1 Message Date
Martin Gansser
42b3485eab Rebuilt for new VDR API version 2.7.7 2025-07-27 18:52:03 +02:00
Fedora Release Engineering
7ce3c5774b Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:01:06 +00:00
Martin Gansser
dc95d7d3fd Update to last git release 2.3.2-0.1.20211217gitcae4629
Add Fix_DrawMessage.patch
2025-07-07 09:17:15 +02:00
Martin Gansser
e83465e813 Rebuilt for new VDR API version 2.7.6 2025-06-22 12:29:31 +02:00
Martin Gansser
3f57e057bc Rebuilt for new VDR API version 2.7.5 2025-05-27 17:14:01 +02:00
Martin Gansser
7d776f89a9 Rebuilt for new VDR API version 2.7.4 2025-02-28 14:07:19 +01:00
Fedora Release Engineering
42f090980f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:12:28 +00:00
Martin Gansser
70c8c77596 Rebuilt for new VDR API version 2.7.2 2024-10-09 15:32:36 +02:00
Miroslav Suchý
8cf79d0629 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:33:07 +02:00
Fedora Release Engineering
29517f7c10 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:39:26 +00:00
Martin Gansser
d2273b2bb6 Rebuilt for new VDR API version 2.6.9 2024-07-15 16:31:21 +02:00
Martin Gansser
b0f7bcb38b Rebuilt for new VDR API version 2.6.8 2024-07-12 08:58:49 +02:00
Martin Gansser
73aed9cb01 Rebuilt for new VDR API version 2024-04-12 16:51:04 +02:00
Martin Gansser
1ad8cb3b5a Rebuilt for new VDR API version 2024-01-26 12:45:44 +01:00
Martin Gansser
998e8887f2 Rebuilt for new VDR API version
Add BR gettext for rawhide
2024-01-05 20:33:49 +01:00
Fedora Release Engineering
da00e749e5 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:30:16 +00:00
Fedora Release Engineering
4ace71fbc2 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:11:04 +00:00
Martin Gansser
2612d10f5b Rebuilt for new VDR API version 2022-12-14 16:56:25 +01:00
Martin Gansser
46cb50cb6d Rebuilt for new VDR API version 2022-12-01 17:51:29 +01:00
Fedora Release Engineering
711e894e27 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:45:53 +00:00
Martin Gansser
7d0b190a73 Rebuilt for new VDR API version 2022-02-04 16:42:10 +01:00
Fedora Release Engineering
8ba6fd3b11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:51:58 +00:00
Martin Gansser
9966e38223 Rebuilt for new VDR API version 2021-12-30 19:27:48 +01:00
Martin Gansser
f5230fa813 Update to 2.3.1 2021-12-20 10:07:36 +01:00
Martin Gansser
25029c1112 Update to 2.3.0 2021-12-13 09:20:40 +01:00
4 changed files with 124 additions and 14 deletions

3
.gitignore vendored
View file

@ -13,3 +13,6 @@
/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

16
Fix_DrawMessage.patch Normal file
View file

@ -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;

View file

@ -1 +1 @@
SHA512 (vdr-osdteletext-2.2.1.tar.gz) = 519c716d794eb9d6cd6e86eb538abe759c89c902ef49baf34586f38757f67239253fe19dc87062c5e13983ef9ddcf663844f165dd493cd41b890e62a1ef37810
SHA512 (vdr-osdteletext-2.3.2-cae4629.tar.gz) = cf52007a011130b9363550da57af26901157159ef2f79976ec090ed537e8873bac3b8b95dcd5265134321a26ded8a20c9c1939393a8530c89ecbac7e3a8a85db

View file

@ -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: 2.2.1
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,17 +39,15 @@ 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
@ -49,7 +65,6 @@ install -Dpm 644 teletext2.ttf \
%find_lang %{name}
%files -f %{name}.lang
%license COPYING
%doc HISTORY README*
@ -59,8 +74,84 @@ install -Dpm 644 teletext2.ttf \
%{_prefix}/lib/tmpfiles.d/%{name}.conf
%attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/
%changelog
* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.3.2-0.3.20211217gitcae4629
- Rebuilt for new VDR API version 2.7.7
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.2.20211217gitcae4629
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 04 2025 Martin Gansser <martinkg@fedoraproject.org> - 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 <martinkg@fedoraproject.org> - 2.3.1-21
- Rebuilt for new VDR API version 2.7.6
* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-20
- Rebuilt for new VDR API version 2.7.5
* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-19
- Rebuilt for new VDR API version 2.7.4
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-17
- Rebuilt for new VDR API version 2.7.2
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.3.1-16
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-14
- Rebuilt for new VDR API version 2.6.9
* Fri Jul 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-13
- Rebuilt for new VDR API version 2.6.8
* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-12
- Rebuilt for new VDR API version
* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-11
- Rebuilt for new VDR API version
* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-10
- Rebuilt for new VDR API version
- Add BR gettext for rawhide
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Dec 14 2022 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-7
- Rebuilt for new VDR API version
* Thu Dec 01 2022 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-6
- Rebuilt for new VDR API version
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Feb 04 2022 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-4
- Rebuilt for new VDR API version
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-2
- Rebuilt for new VDR API version
* Mon Dec 20 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.3.1-1
- Update to 2.3.1
* Mon Dec 13 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.3.0-1
- Update to 2.3.0
* Wed Aug 11 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
@ -139,7 +230,7 @@ install -Dpm 644 teletext2.ttf \
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun May 06 2018 Martin Gansser <martinkg@fedoraproject.org> - 0.9.7-3
- Add %{pname}-4bpp.diff
- Add %%{pname}-4bpp.diff
* Sun Apr 29 2018 Martin Gansser <martinkg@fedoraproject.org> - 0.9.7-2
- Add %%{pname}-%%{version}.patch