gentoo resync : 03.03.2019

5 files changed, 122 insertions, 0 deletions

diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 85806e6fab24..0110ed9a4161 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -1,4 +1,8 @@
+AUX aribb24-1.0.3-add-missing-curly-braces.patch 935 BLAKE2B c9ca9e029ffe686a12fb402410936e747b5e1f5165c3c95bfc76bcc4050b1443298c979fc81a1bc9abfcb166cd3bb13556ca4fd4ff90d8bf115412e5e554ab8b SHA512 cd717195c63d1ea93b22c29da37ebb5780103e4c6ae5387630b3b002fd9c301cb64849fc53809b3d3deb8d7c385dc52fe5585abcb991e572cd8b2fcd61732120
+AUX aribb24-1.0.3-fix-default-macros.patch 1511 BLAKE2B 04b32f01928d66389c771f57886634275ba2375f793710d68d10d51a395beeb94b2eee33865161af0d43307515147c11b69bbd9aae3460962e781ea7c9a96369 SHA512 acc4efcdacb196a3c8d1d5d9af4e44e48cd58e634dc065eddbb859627c1bdeca2202a9bec369125a8bb51ec2818767a59b06e7ceac01a4be00ec6495788306d6
+AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c171785f25b39294c78f8f4f0d2cf610298d0ecc951071b758c33bc1d68230859f032f9e7191a11dd6f7995c4e112a62705a87a54 SHA512 ab9cf73d508d5ae4d570ddf50cb6e914738312951aee49ff010df46d37fc9fd3be67accec518bc43562a12e228fa0d420f005a29c5d17bf1c38bf6bc3a8da090
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
+EBUILD aribb24-1.0.3-r2.ebuild 846 BLAKE2B 3a0818a785fd5fbe440897953b82ac755df947dfa2f5ad6476084ebb978ef72661b602db0e8e3a69a24688d92c32d38e1686bb5d946c92b51d701c525ca330dd SHA512 6853d6fa86391c1f42d230636d8f26cb56a7c760ee22e13d5ab078b41e001f7575a15c04a02faf6fc89a87b0bdbc4cd765d7c23af2d1ea49a0d1f264a70565fd
 EBUILD aribb24-1.0.3.ebuild 610 BLAKE2B be387cc22c418985fe567238db2dfe1add1576f0484d3fc28162f4f47e4e6f22a2ecd642670d8f5dcb43d3866448b7cb6a0206032f9c25b525d9efcd9bd40054 SHA512 5fec871008d5d91cabb85d145327a748d910898b3eda002eb4efbdc7ab7eff4fa6cf0770b900986c8e8046a1e11a7338cdfc3ca55f0fef59eda79b1b9c1c2040
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
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 000000000000..33746cda604e
--- /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 000000000000..97092a26ffcc
--- /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?= <jeebjp@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 000000000000..c55bf234363e
--- /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 <xt4ubq@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 000000000000..30d17ba54b55
--- /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?= <jeebjp@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,