* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-ttxtsubs/, media-plugins/vdr-ttxtsubs/files/
@ 2019-12-11 20:22 Joerg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel @ 2019-12-11 20:22 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 5874 bytes --]
commit: c10c4e576e97bb5a79721c13b3928649234de21a
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 20:07:36 2019 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 20:22:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10c4e57
media-plugins/vdr-ttxtsubs: fixed wrong encode
commit will fix fail on compile
thanks to Nico Roeser, he point this out
moved to eapi=7
this commit will close wrt bug 642528
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../files/vdr-ttxtsubs-0.3.0_teletext-chars.patch | 41 ++++++++++++++++++++++
...s-0.3.0.ebuild => vdr-ttxtsubs-0.3.0-r1.ebuild} | 14 +++++---
.../vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild | 4 +--
3 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch
new file mode 100644
index 00000000000..11faef9853c
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch
@@ -0,0 +1,41 @@
+will fix the wrong encode
+wrt bug 642528
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (13 Nov 2019)
+
+diff -Naur ttxtsubs-0.3.0.orig/teletext-chars.h ttxtsubs-0.3.0/teletext-chars.h
+--- ttxtsubs-0.3.0.orig/teletext-chars.h 2019-11-13 17:37:33.000000000 +0100
++++ ttxtsubs-0.3.0/teletext-chars.h 2019-11-13 17:39:02.000000000 +0100
+@@ -68,19 +68,19 @@
+ */
+
+ uint8_t laG0_nat_opts[13][14] = {
+-{0, '#', 'u', 'c', 't', 'z', 'ý', 'í', 'r', 'é', 'á', 'e', 'ú', 's'}, // 0 - Czech/Slovak
+-{0, '£', '$', '@', '-', '½', '-', '|', '#', '-', '¼', '#', '¾', '÷'}, // 1 - English
+-{0, '#', 'õ', 'S', 'Ä', 'Ö', 'Z', 'Ü', 'Õ', 's', 'ä', 'ö', 'z', 'ü'}, // 2 - Estonian
+-{0, 'é', 'ï', 'à', 'ë', 'ê', 'ù', 'î', '#', 'è', 'â', 'ô', 'û', 'ç'}, // 3 - French
+-{0, '#', '$', '§', 'Ä', 'Ö', 'Ü', '^', '_', 'º', 'ä', 'ö', 'ü', 'ß'}, // 4 - German
+-{0, '£', '$', 'é', 'º', 'ç', '-', '|', '#', 'ù', 'à', 'ò', 'è', 'ì'}, // 5 - Italian
+-{0, '#', '$', 'S', 'e', 'e', 'Z', 'c', 'u', 's', 'a', 'u', 'z', 'i'}, // 6 - Lettish/Lithuanian
+-{0, '#', 'n', 'a', 'Z', 'S', 'L', 'c', 'ó', 'e', 'z', 's', 'l', 'z'}, // 7 - Polish
+-{0, 'ç', '$', 'i', 'á', 'é', 'í', 'ó', 'ú', '¿', 'ü', 'ñ', 'è', 'à'}, // 8 - Portuguese/Spanish
+-{0, '#', '¤', 'T', 'Â', 'S', 'A', 'Î', 'i', 't', 'â', 's', 'a', 'î'}, // 9 - Rumanian
+-{0, '#', 'Ë', 'C', 'C', 'Z', 'D', 'S', 'ë', 'c', 'c', 'z', 'd', 's'}, // 10 - Serbian/Croation/Slovenian
+-{0, '#', '¤', 'É', 'Ä', 'Ö', 'Å', 'Ü', '_', 'é', 'ä', 'ö', 'å', 'ü'}, // 11 - Swedish/Finnish/Hungarian
+-{0, 'T', 'g', 'I', 'S', 'Ö', 'Ç', 'Ü', 'G', 'i', 's', 'ö', 'ç', 'ü'} // 12 - Turkish
++{0, '#', 'u', 'c', 't', 'z', 0xfd, 0xed, 'r', 0xe9, 0xe1, 'e', 0xfa, 's' }, // 0 - Czech/Slovak
++{0, 0xa3, '$', '@', '-', 0xbd, '-', '|', '#', '-', 0xbc, '#', 0xbe, 0xf7}, // 1 - English
++{0, '#', 0xf5, 'S', 0xc4, 0xd6, 'Z', 0xdc, 0xd5, 's', 0xe4, 0xf6, 'z', 0xfc}, // 2 - Estonian
++{0, 0xe9, 0xef, 0xe0, 0xeb, 0xea, 0xf9, 0xee, '#', 0xe8, 0xe2, 0xf4, 0xfb, 0xe7}, // 3 - French
++{0, '#', '$', 0xa7, 0xc4, 0xd6, 0xdc, '^', '_', 0xba, 0xe4, 0xf6, 0xfc, 0xdf}, // 4 - German
++{0, 0xa3, '$', 0xe9, 0xba, 0xe7, '-', '|', '#', 0xf9, 0xe0, 0xf2, 0xe8, 0xec}, // 5 - Italian
++{0, '#', '$', 'S', 'e', 'e', 'Z', 'c', 'u', 's', 'a', 'u', 'z', 'i' }, // 6 - Lettish/Lithuanian
++{0, '#', 'n', 'a', 'Z', 'S', 'L', 'c', 0xf3, 'e', 'z', 's', 'l', 'z' }, // 7 - Polish
++{0, 0xe7, '$', 'i', 0xe1, 0xe9, 0xed, 0xf3, 0xfa, 0xbf, 0xfc, 0xf1, 0xe8, 0xe0}, // 8 - Portuguese/Spanish
++{0, '#', 0xa4, 'T', 0xc2, 'S', 'A', 0xce, 'i', 't', 0xe2, 's', 'a', 0xee}, // 9 - Rumanian
++{0, '#', 0xcb, 'C', 'C', 'Z', 'D', 'S', 0xeb, 'c', 'c', 'z', 'd', 's' }, // 10 - Serbian/Croation/Slovenian
++{0, '#', 0xa4, 0xc9, 0xc4, 0xd6, 0xc5, 0xdc, '_', 0xe9, 0xe4, 0xf6, 0xe5, 0xfc}, // 11 - Swedish/Finnish/Hungarian
++{0, 'T', 'g', 'I', 'S', 0xd6, 0xc7, 0xdc, 'G', 'i', 's', 0xf6, 0xe7, 0xfc} // 12 - Turkish
+ };
+
+ uint16_t laG0_nat_opts16[13][14] = {
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
similarity index 67%
copy from media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
copy to media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
index 78c093d6260..1f196dbb1d8 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit vdr-plugin-2
@@ -11,10 +11,16 @@ DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subt
HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ttxtsubs"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
-DEPEND=">=media-video/vdr-1.7.38[ttxtsubs]"
+DEPEND="media-video/vdr[ttxtsubs]"
RDEPEND="${DEPEND}"
+
+src_prepare() {
+ vdr-plugin-2_src_prepare
+
+ eapply "${FILESDIR}/${P}_teletext-chars.patch"
+}
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
index 78c093d6260..68a2183616c 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit vdr-plugin-2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-ttxtsubs/, media-plugins/vdr-ttxtsubs/files/
@ 2020-03-01 19:01 Jörg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Bornkessel @ 2020-03-01 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 07bbe67ca417fd6c9938158ad9afc78ce9547509
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 19:00:42 2020 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 19:00:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bbe67c
media-plugins/vdr-ttxtsubs: compile for >media-tv/vdr-2.4 fixed
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch | 109 +++++++++++++++++++++
....3.0-r1.ebuild => vdr-ttxtsubs-0.3.0-r2.ebuild} | 4 +
2 files changed, 113 insertions(+)
diff --git a/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch
new file mode 100644
index 00000000000..4b6bf2c05fd
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch
@@ -0,0 +1,109 @@
+diff --git a/ttxtsubs.c b/ttxtsubs.c
+index f9b7bbc..5307c44 100644
+--- a/ttxtsubs.c
++++ b/ttxtsubs.c
+@@ -275,7 +275,8 @@ void cPluginTtxtsubs::Housekeeping(void)
+
+ const char *cPluginTtxtsubs::MainMenuEntry(void)
+ {
+- bool haveChannel = Channels.GetByNumber(cDevice::ActualDevice()->CurrentChannel()) != NULL;
++ LOCK_CHANNELS_READ;
++ bool haveChannel = Channels->GetByNumber(cDevice::ActualDevice()->CurrentChannel()) != NULL;
+ switch(globals.mMainMenuEntry) {
+ case 1:
+ if(globals.mRealDoDisplay)
+@@ -349,7 +350,8 @@ void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber
+ DELETENULL(mLiveReceiver);
+ if (!Device->Replaying() && !Device->Transferring())
+ {
+- cChannel* channel = Channels.GetByNumber(ChannelNumber);
++ LOCK_CHANNELS_READ;
++ const cChannel* channel = Channels->GetByNumber(ChannelNumber);
+ if (channel && channel->Tpid())
+ {
+ mLiveReceiver = new cTtxtSubsLiveReceiver(channel, this);
+diff --git a/ttxtsubschannelsettings.c b/ttxtsubschannelsettings.c
+index b543a36..7f9d326 100644
+--- a/ttxtsubschannelsettings.c
++++ b/ttxtsubschannelsettings.c
+@@ -48,8 +48,9 @@ bool cTtxtSubsChannelSetting::Parse(const char *s)
+ }
+ else { // parse old format
+ int sid;
++ LOCK_CHANNELS_READ;
+ if (1 == sscanf(buffer, "%d", &sid)) {
+- for (cChannel *ch = Channels.First(); ch; ch = Channels.Next(ch)) {
++ for (const cChannel *ch = Channels->First(); ch; ch = Channels->Next(ch)) {
+ if (!ch->GroupSep() && ch->Sid() == sid) {
+ channelid=ch->GetChannelID();
+ pagemode=PageMode;
+diff --git a/ttxtsubslivereceiver.c b/ttxtsubslivereceiver.c
+index 9f60fdd..586d5af 100644
+--- a/ttxtsubslivereceiver.c
++++ b/ttxtsubslivereceiver.c
+@@ -22,7 +22,7 @@
+ #include <vdr/remux.h>
+ #include "ttxtsubslivereceiver.h"
+
+-cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(cChannel* channel, cVDRTtxtsubsHookListener* hook)
++cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(const cChannel* channel, cVDRTtxtsubsHookListener* hook)
+ :
+ _channel(channel),
+ _hook(hook)
+@@ -35,7 +35,7 @@ cTtxtSubsLiveReceiver::~cTtxtSubsLiveReceiver()
+ cReceiver::Detach();
+ }
+
+-void cTtxtSubsLiveReceiver::Receive(uchar *Data, int Length)
++void cTtxtSubsLiveReceiver::Receive(const uchar *Data, int Length)
+ {
+ if (Data == NULL)
+ {
+diff --git a/ttxtsubslivereceiver.h b/ttxtsubslivereceiver.h
+index d361c7b..0aba89b 100644
+--- a/ttxtsubslivereceiver.h
++++ b/ttxtsubslivereceiver.h
+@@ -29,12 +29,12 @@ class cTtxtSubsLiveReceiver : public cReceiver
+ {
+ private:
+ cTsToPes tsToPesTeletext;
+- cChannel* _channel;
++ const cChannel* _channel;
+ cVDRTtxtsubsHookListener* _hook;
+ protected:
+- virtual void Receive(uchar *Data, int Length);
++ virtual void Receive(const uchar *Data, int Length);
+ public:
+- cTtxtSubsLiveReceiver(cChannel* channel, cVDRTtxtsubsHookListener* hook);
++ cTtxtSubsLiveReceiver(const cChannel* channel, cVDRTtxtsubsHookListener* hook);
+ virtual ~cTtxtSubsLiveReceiver();
+ };
+
+diff --git a/ttxtsubspagemenu.c b/ttxtsubspagemenu.c
+index cd7b6d0..b03949c 100644
+--- a/ttxtsubspagemenu.c
++++ b/ttxtsubspagemenu.c
+@@ -35,8 +35,9 @@ cTtxtsubsPageMenu::~cTtxtsubsPageMenu()
+ cTtxtsubsPageMenu::cTtxtsubsPageMenu()
+ :cOsdMenu(tr("Subtitle Page Settings"), 30)
+ {
++ LOCK_CHANNELS_READ;
+ cDevice *device = cDevice::ActualDevice();
+- channel = Channels.GetByNumber(device->CurrentChannel());
++ channel = Channels->GetByNumber(device->CurrentChannel());
+ setting = TtxtSubsChannelSettings.Get(channel);
+ if (setting) {
+ origPageMode = mPageMode = setting->PageMode();
+diff --git a/ttxtsubspagemenu.h b/ttxtsubspagemenu.h
+index ad4bd48..ffe82d9 100644
+--- a/ttxtsubspagemenu.h
++++ b/ttxtsubspagemenu.h
+@@ -29,7 +29,7 @@
+ class cTtxtsubsPageMenu : public cOsdMenu
+ {
+ private:
+- cChannel *channel;
++ const cChannel *channel;
+ cTtxtSubsChannelSetting *setting;
+ int mPageNumber;
+ int mPageMode;
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
similarity index 86%
rename from media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
rename to media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
index 9fe2f3ec6aa..5243d459cc0 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r2.ebuild
@@ -23,4 +23,8 @@ src_prepare() {
vdr-plugin-2_src_prepare
eapply "${FILESDIR}/${P}_teletext-chars.patch"
+
+ if has_version ">=media-video/vdr-2.4"; then
+ eapply "${FILESDIR}/${P}_vdr-2.4.0.patch"
+ fi
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-01 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-01 19:01 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-ttxtsubs/, media-plugins/vdr-ttxtsubs/files/ Jörg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2019-12-11 20:22 Joerg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox