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 <[email protected]> (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
