diff --git a/osdteletext-4bpp.diff b/osdteletext-4bpp.diff index c6d24f3..09e5614 100644 --- a/osdteletext-4bpp.diff +++ b/osdteletext-4bpp.diff @@ -1,22 +1,304 @@ -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) +--- osdteletext-0.9.7/HISTORY.orig 2021-01-27 08:57:18.829101720 +0100 ++++ osdteletext-0.9.7/HISTORY 2021-01-27 08:57:39.161102603 +0100 +@@ -1,5 +1,8 @@ + VDR Plugin 'osdteletext' Revision History + ----------------------------------------- ++- [pbiering] add configurable 4bpp color mode base on hardcoded patch: ++ https://www.vdr-portal.de/index.php?attachment/41884-osdteletext-4bpp-diff/ ++ https://www.vdr-portal.de/forum/index.php?thread/131627-gel%C3%B6st-vdr-plugin-osdteletxt-0-9-7/&postID=1304681#post1304681 + + 2018-02-24: version 0.9.7 + - Added teletext2.ttf +--- osdteletext-0.9.7/display.c.orig 2021-01-27 08:57:42.875102765 +0100 ++++ osdteletext-0.9.7/display.c 2021-01-27 09:00:24.369109783 +0100 +@@ -90,7 +90,8 @@ 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 } }; ++ int bpp = 32; if (ttSetup.colorMode4bpp == true) bpp = 4; ++ tArea Areas[] = { { 0, 0, width - 1, height - 1, bpp } }; if (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) != oeOk) { DELETENULL(osd); return; -@@ -130,7 +130,7 @@ void cDisplay32BPPHalf::InitOSD() { +@@ -105,7 +106,7 @@ + Height = 250; + #endif + +- esyslog("OSD-Teletext: 32BPP"); ++ esyslog("OSD-Teletext: %dBPP", bpp); + + InitScaler(); + +@@ -130,7 +131,8 @@ 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 } }; ++ int bpp = 32; if (ttSetup.colorMode4bpp == true) bpp = 4; ++ tArea Areas[] = { { 0, 0, width - 1, Height - 1, bpp } }; // Try full-size area first while (osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) != oeOk) { +--- osdteletext-0.9.7/osdteletext.c.orig 2021-01-27 09:00:45.003110680 +0100 ++++ osdteletext-0.9.7/osdteletext.c 2021-01-27 09:04:06.682119444 +0100 +@@ -277,6 +277,7 @@ + else if (!strcasecmp(Name, "txtFontName")) ttSetup.txtFontName=strdup(Value); + else if (!strcasecmp(Name, "txtG0Block")) ttSetup.txtG0Block=atoi(Value); + else if (!strcasecmp(Name, "txtG2Block")) ttSetup.txtG2Block=atoi(Value); ++ else if (!strcasecmp(Name, "colorMode4bpp")) ttSetup.colorMode4bpp=atoi(Value); + else { + for (int i=0;i\n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-05-04 15:33+0200\n" + "Last-Translator: Jordi Vilà \n" + "Language-Team: Catalan \n" +@@ -108,6 +108,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "" + +--- osdteletext-0.9.7/po/de_DE.po.orig 2021-01-27 09:06:44.613126308 +0100 ++++ osdteletext-0.9.7/po/de_DE.po 2021-01-27 09:07:39.179128679 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-05-04 15:33+0200\n" + "Last-Translator: Klaus Schmidinger \n" + "Language-Team: German \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "Farbmodus 4bpp" ++ + msgid "Key bindings" + msgstr "Tastenzuweisung" + +--- osdteletext-0.9.7/po/es_ES.po.orig 2021-01-27 09:07:59.515129563 +0100 ++++ osdteletext-0.9.7/po/es_ES.po 2021-01-27 09:08:44.001131496 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-05-04 15:33+0200\n" + "Last-Translator: Ruben Nunez Francisco \n" + "Language-Team: Spanish \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "" + +--- osdteletext-0.9.7/po/fi_FI.po.orig 2021-01-27 09:09:01.570132259 +0100 ++++ osdteletext-0.9.7/po/fi_FI.po 2021-01-27 09:09:45.553134171 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-05-04 15:33+0200\n" + "Last-Translator: Rolf Ahrenberg \n" + "Language-Team: Finnish \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "G2-koodilohko" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Näppäintoiminnot" + +--- osdteletext-0.9.7/po/fr_FR.po.orig 2021-01-27 09:10:02.115134891 +0100 ++++ osdteletext-0.9.7/po/fr_FR.po 2021-01-27 09:10:54.160137152 +0100 +@@ -10,7 +10,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2009-01-10 19:32+0100\n" + "Last-Translator: Nival Michaël\n" + "Language-Team: French \n" +@@ -109,6 +109,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Attribution des touches" + +--- osdteletext-0.9.7/po/it_IT.po.orig 2021-01-27 09:11:10.834137877 +0100 ++++ osdteletext-0.9.7/po/it_IT.po 2021-01-27 09:11:52.025139667 +0100 +@@ -11,7 +11,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2010-11-06 19:59+0100\n" + "Last-Translator: Diego Pierotto \n" + "Language-Team: Italian \n" +@@ -113,6 +113,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Tasti associati" + +--- osdteletext-0.9.7/po/pt_PT.po.orig 2021-01-27 09:12:10.274140460 +0100 ++++ osdteletext-0.9.7/po/pt_PT.po 2021-01-27 09:12:51.432142249 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-05-04 15:33+0200\n" + "Last-Translator: Chris Silva \n" + "Language-Team: Portuguese \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Tecla alocada" + +--- osdteletext-0.9.7/po/ru_RU.po.orig 2021-01-27 09:13:09.058143015 +0100 ++++ osdteletext-0.9.7/po/ru_RU.po 2021-01-27 09:13:48.792144741 +0100 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-06-10 21:01+1000\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2008-12-30 13:52+0100\n" + "Last-Translator: Andrey Pridvorov \n" + "Language-Team: Russian \n" +@@ -107,6 +107,9 @@ + msgid "G2 code block" + msgstr "G2 кодировка" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Привязка кнопок" + +--- osdteletext-0.9.7/po/sk_SK.po.orig 2021-01-27 09:14:04.202145411 +0100 ++++ osdteletext-0.9.7/po/sk_SK.po 2021-01-27 09:14:37.784146871 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: osdteletext-0.9.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2011-02-15 21:11+0100\n" + "Last-Translator: Milan Hrala \n" + "Language-Team: Slovak \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Klávesové skratky" + +--- osdteletext-0.9.7/po/uk_UA.po.orig 2021-01-27 09:14:55.665147648 +0100 ++++ osdteletext-0.9.7/po/uk_UA.po 2021-01-27 09:15:26.864149004 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: VDR 1.5.7\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2018-01-31 22:27+0200\n" ++"POT-Creation-Date: 2021-01-27 06:22+0100\n" + "PO-Revision-Date: 2009-05-25 20:33+0200\n" + "Last-Translator: Yarema P. aka Knedlyk \n" + "Language-Team: Ukrainian \n" +@@ -106,6 +106,9 @@ + msgid "G2 code block" + msgstr "" + ++msgid "Color Mode 4bpp" ++msgstr "" ++ + msgid "Key bindings" + msgstr "Призначення клавіш" + +--- osdteletext-0.9.7/setup.h.orig 2021-01-27 09:15:44.474149769 +0100 ++++ osdteletext-0.9.7/setup.h 2021-01-27 09:16:20.544151336 +0100 +@@ -52,6 +52,7 @@ + int txtG0Block; + int txtG2Block; + const char *txtBlock[11]; ++ int colorMode4bpp; + }; + + extern TeletextSetup ttSetup; diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec index 04a34dc..0cfdbd6 100644 --- a/vdr-osdteletext.spec +++ b/vdr-osdteletext.spec @@ -3,7 +3,7 @@ Name: vdr-%{pname} Version: 0.9.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: OSD teletext plugin for VDR License: GPLv2+ @@ -12,10 +12,9 @@ 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/ +# https://github.com/vdr-projects/vdr-plugin-osdteletext/pull/1/commits/a4532c884275839710def9588e41d91aaca99bb5 Patch1: %{pname}-4bpp.diff -BuildRequires: make BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 1.7.39 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -27,7 +26,7 @@ background. %prep -%autosetup -n %{pname}-%{version} +%autosetup -p1 -n %{pname}-%{version} sed -i -e 's|/var/cache/vdr/vtx|%{vdr_rundir}/%{pname}|g' \ osdteletext.c README README.DE rootdir.c @@ -60,6 +59,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Wed Jan 27 2021 Martin Gansser - 0.9.7-12 +- add configurable 4bpp color mode base on hardcoded patch + * Sun Jan 03 2021 Martin Gansser - 0.9.7-11 - Rebuilt for new VDR API version