From cd98848a2f7ca14eaff35770e3da33ae9553d741 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: May 06 2018 09:02:25 +0000 Subject: Add osdteletext-4bpp.diff --- diff --git a/osdteletext-4bpp.diff b/osdteletext-4bpp.diff new file mode 100644 index 0000000..c6d24f3 --- /dev/null +++ b/osdteletext-4bpp.diff @@ -0,0 +1,22 @@ +diff --git a/display.c b/display.c +index 9f580a9..fda9d6d 100644 +--- a/display.c ++++ b/display.c +@@ -90,7 +90,7 @@ cDisplay32BPP::cDisplay32BPP(int x0, int y0, int width, int height) + width=(width+1)&~1; + // Width has to end on byte boundary, so round up + +- tArea Areas[] = { { 0, 0, width - 1, height - 1, 32 } }; ++ tArea Areas[] = { { 0, 0, width - 1, height - 1, 4 } }; + if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) != oeOk) { + DELETENULL(osd); + return; +@@ -130,7 +130,7 @@ void cDisplay32BPPHalf::InitOSD() { + int width=(Width+1)&~1; + // Width has to end on byte boundary, so round up + +- tArea Areas[] = { { 0, 0, width - 1, Height - 1, 32 } }; ++ tArea Areas[] = { { 0, 0, width - 1, Height - 1, 4 } }; + // Try full-size area first + + while (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) != oeOk) { diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 1ff6327..5b21dd8 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -3,7 +3,7 @@ Name: vdr-%{pname} Version: 0.9.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OSD teletext plugin for VDR License: GPLv2+ @@ -12,6 +12,8 @@ Source0: https://projects.vdr-developer.org/attachments/download/2161/%{n Source1: %{name}.conf # https://www.vdr-portal.de/index.php?attachment/41771-osdteletext-0-9-7-patch/ Patch0: %{pname}-%{version}.patch +# https://www.vdr-portal.de/index.php?attachment/41884-osdteletext-4bpp-diff/ +Patch1: %{pname}-4bpp.diff BuildRequires: vdr-devel >= 1.7.39 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -25,6 +27,7 @@ background. %prep %setup -q -n %{pname}-%{version} %patch0 -p1 +%patch1 -p1 sed -i -e 's|/var/cache/vdr/vtx|%{vdr_rundir}/%{pname}|g' \ osdteletext.c README README.DE rootdir.c @@ -57,8 +60,11 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Sun May 06 2018 Martin Gansser - 0.9.7-3 +- Add %{pname}-4bpp.diff + * Sun Apr 29 2018 Martin Gansser - 0.9.7-2 -- Add osdteletext-0.9.7.patch +- Add %%{pname}-%%{version}.patch - Rebuilt for vdr-2.4.0 * Sun Feb 25 2018 Thomas Sailer - 0.9.7-1