commit: a75acc7c19a7e0cda7d1a14a4ebfec42779a1f09 Author: Hector Martin <marcan <AT> marcan <DOT> st> AuthorDate: Mon Feb 18 09:48:46 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 21 17:28:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75acc7c
media-libs/aribb24-1.0.3-r2: Add unreleased bugfix patches Signed-off-by: Hector Martin <marcan <AT> marcan.st> Package-Manager: Portage-2.3.60, Repoman-2.3.12 Closes: https://github.com/gentoo/gentoo/pull/11091 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/aribb24/aribb24-1.0.3-r2.ebuild | 37 ++++++++++++++++++++++ .../aribb24-1.0.3-add-missing-curly-braces.patch | 27 ++++++++++++++++ .../files/aribb24-1.0.3-fix-default-macros.patch | 31 ++++++++++++++++++ .../files/aribb24-1.0.3-reset-control_time.patch | 23 ++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild new file mode 100644 index 00000000000..33746cda604 --- /dev/null +++ b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="Library for decoding ARIB STD-B24 subtitles" +HOMEPAGE="https://github.com/nkoriyama/aribb24"; +SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-reset-control_time.patch + "${FILESDIR}"/${P}-fix-default-macros.patch + "${FILESDIR}"/${P}-add-missing-curly-braces.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf --disable-static +} + +multilib_src_install_all() { + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/aribb24/files/aribb24-1.0.3-add-missing-curly-braces.patch b/media-libs/aribb24/files/aribb24-1.0.3-add-missing-curly-braces.patch new file mode 100644 index 00000000000..97092a26ffc --- /dev/null +++ b/media-libs/aribb24/files/aribb24-1.0.3-add-missing-curly-braces.patch @@ -0,0 +1,27 @@ +From ad161e98700b31e262db3f9ac2dd4e9761602faa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= <jee...@gmail.com> +Date: Sun, 17 Feb 2019 23:13:00 +0200 +Subject: [PATCH] decoder: add curly braces around a multi-line statement + +It seems like these are meant to be executed together when correct +data is decoded. Right now it would always return one in this +default case. +--- + src/decoder.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/decoder.c b/src/decoder.c +index 2b77f38..69ea351 100644 +--- a/src/decoder.c ++++ b/src/decoder.c +@@ -1140,8 +1140,10 @@ static int decoder_handle_time( arib_decoder_t *decoder ) + break; + default: + if( i_mode == 1 && c >= 0x40 && c <= 0x7F ) ++ { + decoder->i_control_time += c & 0x3f; + return 1; ++ } + return 0; + } + if( i_mode == 0 ) diff --git a/media-libs/aribb24/files/aribb24-1.0.3-fix-default-macros.patch b/media-libs/aribb24/files/aribb24-1.0.3-fix-default-macros.patch new file mode 100644 index 00000000000..c55bf234363 --- /dev/null +++ b/media-libs/aribb24/files/aribb24-1.0.3-fix-default-macros.patch @@ -0,0 +1,31 @@ +From a5bcc6d17c20e18bdeec295089cc0cdfac9d35c8 Mon Sep 17 00:00:00 2001 +From: xtne6f <xt4...@gmail.com> +Date: Thu, 7 Feb 2019 20:11:13 +0900 +Subject: [PATCH] Fix default macros + +--- + src/decoder_macro.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/decoder_macro.h b/src/decoder_macro.h +index 86edee4..513b81e 100644 +--- a/src/decoder_macro.h ++++ b/src/decoder_macro.h +@@ -30,7 +30,7 @@ static const unsigned char decoder_default_macro_1[] = { + 0x1B,0x24,0x39,0x1B,0x29,0x31,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D + }; + static const unsigned char decoder_default_macro_2[] = { +- 0x1B,0x24,0x39,0x1B,0x29,0x20,0x40,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D ++ 0x1B,0x24,0x39,0x1B,0x29,0x20,0x41,0x1B,0x2A,0x30,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D + }; + static const unsigned char decoder_default_macro_3[] = { + 0x1B,0x28,0x32,0x1B,0x29,0x34,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D +@@ -39,7 +39,7 @@ static const unsigned char decoder_default_macro_4[] = { + 0x1B,0x28,0x32,0x1B,0x29,0x33,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D + }; + static const unsigned char decoder_default_macro_5[] = { +- 0x1B,0x28,0x32,0x1B,0x29,0x20,0x40,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D ++ 0x1B,0x28,0x32,0x1B,0x29,0x20,0x41,0x1B,0x2A,0x35,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D + }; + static const unsigned char decoder_default_macro_6[] = { + 0x1B,0x28,0x20,0x41,0x1B,0x29,0x20,0x42,0x1B,0x2A,0x20,0x43,0x1B,0x2B,0x20,0x70,0x0F,0x1B,0x7D diff --git a/media-libs/aribb24/files/aribb24-1.0.3-reset-control_time.patch b/media-libs/aribb24/files/aribb24-1.0.3-reset-control_time.patch new file mode 100644 index 00000000000..30d17ba54b5 --- /dev/null +++ b/media-libs/aribb24/files/aribb24-1.0.3-reset-control_time.patch @@ -0,0 +1,23 @@ +From facc51923d43f26dec09a9391566de7cba29f8db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= <jee...@gmail.com> +Date: Sun, 17 Feb 2019 22:42:31 +0200 +Subject: [PATCH] decoder: reset control_time when finalizing decoder + +This way finalize_decoder() can properly be utilized as a flush +function. +--- + src/decoder.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/decoder.c b/src/decoder.c +index 2b77f38..24c0f06 100644 +--- a/src/decoder.c ++++ b/src/decoder.c +@@ -1506,6 +1506,7 @@ void arib_finalize_decoder( arib_decoder_t* decoder ) + free( p_region ); + } + decoder->p_region = NULL; ++ decoder->i_control_time = 0; + } + + size_t arib_decode_buffer( arib_decoder_t* decoder,
