From 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 22 Apr 2018 14:25:03 +0100
Subject: gentoo resync : 22.04.2018

---
 media-sound/moc/Manifest              |  3 ++-
 media-sound/moc/files/ffmpeg4.patch   | 33 +++++++++++++++++++++++++++++++++
 media-sound/moc/moc-2.6_alpha3.ebuild |  3 ++-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 media-sound/moc/files/ffmpeg4.patch

(limited to 'media-sound/moc')

diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 511a5c71104d..8d00d4ebecae 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,5 +1,6 @@
+AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2150 BLAKE2B 43a1df14f3ae4593eeca4cc28db864e6e1dfedb9a25a572303e622e0b06c344b73eb5eeadf0c1e05293c898ffe487c0e8cb104a438f635f64360d1ddd6560c7c SHA512 8fbec8b83319e7b6c6f719ff9cf27cae859b0dcde115bb50ddcbf62aef90d12f533211f59ec548a39270b6817300b0fa27b611d7ec133204e0384a97509bb18c
-EBUILD moc-2.6_alpha3.ebuild 2272 BLAKE2B 2d2e89e68010a53f36b8649dcc1050e90fa61251c05f99cdb63e914438b20d121d14e9a367906dbdcd847b0acd7a8988fb228cee14fb7ae43c4a01a0eb3d1193 SHA512 87e8d9e59ba0de11fb9a2ab04b016e07082faa3fb79451cb577e70ee7e016d8827cf04286cdfb993c6e8f095426f02f1984c6c109c58ba5a65b538cab393104e
+EBUILD moc-2.6_alpha3.ebuild 2312 BLAKE2B 8f7b06032d1e68608980d417798a9ecfe274e88abd942fc6eb2e635d8b51b977c96f2eb3bd2f85a5910c1f010d18bdc01ef215dfb9df5f9abc4da04ac6812eb4 SHA512 983f878411b05b3345afa643cd3a8fb7a45a8441565cc9a770b16e315136c016b1400c050f80e33d7ca0d2adf0169f1fa852de7a4cb73d6d97176b9f56cb9ada
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/files/ffmpeg4.patch b/media-sound/moc/files/ffmpeg4.patch
new file mode 100644
index 000000000000..28b688823470
--- /dev/null
+++ b/media-sound/moc/files/ffmpeg4.patch
@@ -0,0 +1,33 @@
+Index: moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc-2.6-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -697,7 +697,7 @@ static void *ffmpeg_open_internal (struc
+ 	 * FFmpeg/LibAV in use.  For some versions this will be caught in
+ 	 * *_find_stream_info() above and misreported as an unfound codec
+ 	 * parameters error. */
+-	if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++	if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+ 		decoder_error (&data->error, ERROR_FATAL, 0,
+ 				"The codec is experimental and may damage MOC: %s",
+ 				data->codec->name);
+@@ -705,8 +705,8 @@ static void *ffmpeg_open_internal (struc
+ 	}
+ 
+ 	set_downmixing (data);
+-	if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+-		data->enc->flags |= CODEC_FLAG_TRUNCATED;
++	if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++		data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+ 	if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ 	{
+@@ -725,7 +725,7 @@ static void *ffmpeg_open_internal (struc
+ 
+ 	data->sample_width = sfmt_Bps (data->fmt);
+ 
+-	if (data->codec->capabilities & CODEC_CAP_DELAY)
++	if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+ 		data->delay = true;
+ 	data->seek_broken = is_seek_broken (data);
+ 	data->timing_broken = is_timing_broken (data->ic);
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index d68ba88aa230..b2d3b3643bd9 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 "
 
 S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
 
 src_configure() {
 	local myconf=(
-- 
cgit v1.2.3