Compare commits

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

1 commit

Author SHA1 Message Date
Martin Gansser
18487a4c6b Update to last git release 2.3.2-0.1.20211217gitcae4629
Add Fix_DrawMessage.patch
2025-07-07 09:28:47 +02:00
4 changed files with 59 additions and 11 deletions

1
.gitignore vendored
View file

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

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.3.1.tar.gz) = 1ffeebd35693a6fb41fd0c422e86ec2fdf4dfce5ffbdabd3da65421e50e390c68d9c0a38d5fca8bc65ff65bc2e4d529e520ea52ee304659cde2a337b3bce4a48
SHA512 (vdr-osdteletext-2.3.2-cae4629.tar.gz) = cf52007a011130b9363550da57af26901157159ef2f79976ec090ed537e8873bac3b8b95dcd5265134321a26ded8a20c9c1939393a8530c89ecbac7e3a8a85db

View file

@ -1,21 +1,32 @@
%global pname osdteletext
%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
# version we want build against
%global vdr_version 2.6.3
%if 0%{?fedora} >= 40
%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
%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: 16%{?dist}
Version: 2.3.2
Release: 0.1.%{gitdate}git%{shortcommit0}%{?dist}
# Release: 21%%{?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
Source0: https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
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++
@ -29,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
@ -63,6 +75,25 @@ install -Dpm 644 teletext2.ttf \
%attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/
%changelog
* 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
@ -193,7 +224,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