gentoo resync : 18.11.2018

3 files changed, 82 insertions, 3 deletions

diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 2802c9d9d5ae..5f247800e87b 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,11 +1,12 @@
 AUX 0.3.4-git-revision.patch 404 BLAKE2B 02f6fdc21f1a722623fb66013eba7af0a327e702444f1bedc61e52832575045938fbcd80b9bd8dc56e936d2b058b751a00eb5b147987cceab36fb2bc758cc8ed SHA512 617c5586d0948f9aa5acdef38cdceb29e98a07cb40a284e07e780d0344168408bf14fae612fb5d2baa648f6083b0d37820a70a002631abf6cdeb38a3948bd617
 AUX 0.3.5-cmake.patch 3049 BLAKE2B c6ee8f4d7647d2d216225fc35c6744cb4fadd4d8a958fe86196d250fefa38ad53e4c4ecdca43c84bd7aa1705ab74efd7b9d694d5457ee9fa2f4335921f4c8f79 SHA512 95d07febb1cf159bd22ba3551fd712ab04e26f2422a01940285a19648d570a92b0d399a48fad54eba6b7faecd00f51b98e117e5f5df4b7dd1238a73bbe46d353
 AUX 0.3.9-ioctl.patch 369 BLAKE2B 88dba5e3e0d49fc7f6f3c2b56a8e7888be48b88dc77c2613c48cdddfc6090772d8d18787bb0f0997246deb1ae07d588352c41becaa9f1767db20799519449b22 SHA512 6a1c32602ac889cd2de52beed3870d12c1815eba0eabe77a1de1380d5015fb21eb697be7f6ac9fa9efe8a0e74f71e741e3cde4b9dec775f4158905435af7bc16
+AUX freshplayerplugin-0.3.9-ffmpeg-4.patch 3116 BLAKE2B 820c6ab058620406fce34260470b46c70bd970571a518ecdbd38e18ed170711e93bddd95d0bc95f2cada1b6b5cf4a74cfcf68cb23699ac32d886e43b0d9f3b77 SHA512 f7adae50de4cdca812ba1bad32ec10f9f97bf484c7e88b06be22e7677774093f17353f3e21ce2d26273cb076cee128a41311b1bf5b891031df27dc2f0684b272
 DIST freshplayerplugin-0.3.5.tar.gz 781003 BLAKE2B 9874f07905a277c95374a697397dc9b3661cdba40b39ee74702d4ec67a0447d13cc2a187c695b47be9f922177b37bdf5fff8ebb9dd57b709f884ffa3db0da54d SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0
 DIST freshplayerplugin-0.3.7.tar.gz 789974 BLAKE2B 0217e3431164e9dfce4ec21f07331aea4b5841b963c51c258f10c68d8089b8f860364d58af533f3724f8759b8d6381cba950f174b2ca3f0a7b59c581192b5a47 SHA512 9ef534b873833d69caa86a5702ad6150e4aa2fe399159a550b6cb0ebad2754d25e185c54b6285f6f50913c5595c5b460ce3e0d21ac45f0d25793805463ce1d5d
 DIST freshplayerplugin-0.3.9.tar.gz 790261 BLAKE2B 88526c01e7a06c7b295e5a7652602eb661097f869b30c8fd0978a4e03adea9d1fa75d35e5e9c0751d786c04f0247fc292aa0c1857cf1fa575eb0b11499bec7fc SHA512 999d7c223dd493e43a0fa7874371c7b781fe5273b2661fc30f814832b4aafd23f297795b644f58553107ef962ca17ce58fb39a637d1ab7bdf470cd33e0b19cf8
 EBUILD freshplayerplugin-0.3.5-r2.ebuild 1851 BLAKE2B 7bcd5da8e281c5d584966035fa6ff27c7c279ec72e8e45ec40b3e94e07be6ab92b945ceed726e6fe2cf36a2819f8fbca4e6aab24db5652301942cee35222e981 SHA512 d8ebf65ac798abf5e1e00438b5c10e9140adf2b0d531a9bfc95e0dd1b1e3193b366e23fe2647846a87aba5ea491d72e0d377b2d7dae8d958cad92819b41be04c
 EBUILD freshplayerplugin-0.3.5-r3.ebuild 1873 BLAKE2B 910f1cd17fe94f0a81306ece58ec4424a82ebe6ac953abc8ff7bb0969127da47d85d8aada676f8c57c50fbadd3422f97cbf33bcf87ab9db692098b3c12f698dc SHA512 83d5544d6b36efbafbfa25f12cdacd3c5d4c0f246dce0a9a19f7f7ac82ee344ebc9f3f593bdeb32f7763ecb0149bef169e217b3632a69e61c8e7bdc893188bca
 EBUILD freshplayerplugin-0.3.7.ebuild 1834 BLAKE2B e3efe1e39d17332e71feb9d9a88d0cea86ce38f52859684fe53007f89ca95eca3ae8ad4ac87840e22368dd9d9356069670b8e768672389e82b56ad2a2865e0b7 SHA512 58797302082e763a98e7dc573246657020003c4b2f7ff1845c85755dd79300e74d8730698709fcc032873cd7f1bdf36b5557660469f1c01364099a05379ba5c8
-EBUILD freshplayerplugin-0.3.9.ebuild 1775 BLAKE2B 7d6b60b47cf136153aca6f49b3c9e5dc954dd242b9540ec08ea3bd6a727a6071a5ba5ce53f1883194977b091d1e46bde8ae349eff0bd4199aae3b96b99e63111 SHA512 75d7c0d2526568fd6fa8413bc8236e61465b00dd19a71167cbdb80a1e3de5d9ab3be5cdd5392eb6f5eb44190dc535764adf0a6feb22ef6fc2b23f9118ca67371
+EBUILD freshplayerplugin-0.3.9.ebuild 1809 BLAKE2B c59500c76fe4858f4d54cebd0a548780abb3636cdf6376d9863dfecfbdc22da36c3473e5dbcc0ae1e269a1ef2423116e3e219db293c67835bc6216addcbf2e4b SHA512 3f58a1cf00e8b1f278d35ae9b40dd1710cf7c9fcad5b882c00833d95b7e44e5dda032b689e40820c3caa0e6f07ce570ee873c0c3adb3cb4a9bc2217d3a63cb12
 MISC metadata.xml 467 BLAKE2B 1e0d9ff2c511c8e645d7cd5fe968b83e7ec32b583833fc007cf4a09d4644b64d22b11634fc8254430a311a4300daf0d0eeb8d86b4d277adbf32d28b48c5e758d SHA512 bea3036d6f203357e9598394f09ffe33fa34d3738317554815bb0c283ab71f24607948a4554a9dd75374f02db8893a96059ff4d61179c354e345b77d44d92db0
diff --git a/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch b/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch
new file mode 100644
index 000000000000..15d713bc4e90
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/freshplayerplugin-0.3.9-ffmpeg-4.patch
@@ -0,0 +1,74 @@
+From 934aa9c24d34f8203744b56e4ac6e8599446ca02 Mon Sep 17 00:00:00 2001
+From: Rinat Ibragimov <ibragimovrinat@mail.ru>
+Date: Tue, 26 Dec 2017 16:16:39 +0300
+Subject: [PATCH] ppb_video_decoder: use AV_ prefixed macros
+
+Looks like newer FFmpeg versions have droped old definitions.
+---
+ cmake/ffmpeg-compat/CMakeLists.txt     |  1 +
+ cmake/ffmpeg-compat/cfg_avcodecflags.c |  4 ++++
+ cmake/ffmpeg-compat/ffmpeg_compat.h.in |  1 +
+ src/ppb_video_decoder.c                | 11 ++++++++---
+ 4 files changed, 14 insertions(+), 3 deletions(-)
+ create mode 100644 cmake/ffmpeg-compat/cfg_avcodecflags.c
+
+diff --git a/cmake/ffmpeg-compat/CMakeLists.txt b/cmake/ffmpeg-compat/CMakeLists.txt
+index 732a71ee..8f67c581 100644
+--- a/cmake/ffmpeg-compat/CMakeLists.txt
++++ b/cmake/ffmpeg-compat/CMakeLists.txt
+@@ -29,6 +29,7 @@ MACRO_C_SOURCE_CHECK(cfg_av_pix_fmt_vdpau.c HAVE_AV_PIX_FMT_VDPAU)
+ MACRO_C_SOURCE_CHECK(cfg_avcodecid.c HAVE_AVCodecID)
+ MACRO_C_SOURCE_CHECK(cfg_avcodeccontext_get_buffer2.c HAVE_AVCodecContext_get_buffer2)
+ MACRO_C_SOURCE_CHECK(cfg_AVVDPAUContext.c HAVE_AVVDPAUContext)
++MACRO_C_SOURCE_CHECK(cfg_avcodecflags.c HAVE_AV_CODEC_FLAGS)
+ 
+ MACRO_SYMBOL_CHECK(av_frame_alloc "libavcodec/avcodec.h" HAVE_av_frame_alloc)
+ MACRO_SYMBOL_CHECK(av_frame_free "libavcodec/avcodec.h" HAVE_av_frame_free)
+diff --git a/cmake/ffmpeg-compat/cfg_avcodecflags.c b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+new file mode 100644
+index 00000000..d04de55b
+--- /dev/null
++++ b/cmake/ffmpeg-compat/cfg_avcodecflags.c
+@@ -0,0 +1,4 @@
++#include <libavcodec/avcodec.h>
++int main(void) {
++    return AV_CODEC_FLAG_TRUNCATED + AV_CODEC_CAP_TRUNCATED;
++}
+diff --git a/cmake/ffmpeg-compat/ffmpeg_compat.h.in b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+index dd40922c..da7834b1 100644
+--- a/cmake/ffmpeg-compat/ffmpeg_compat.h.in
++++ b/cmake/ffmpeg-compat/ffmpeg_compat.h.in
+@@ -6,3 +6,4 @@
+ #define HAVE_av_frame_free              (@HAVE_av_frame_free@)
+ #define HAVE_avcodec_free_context       (@HAVE_avcodec_free_context@)
+ #define HAVE_AVVDPAUContext             (@HAVE_AVVDPAUContext@)
++#define HAVE_AV_CODEC_FLAGS             (@HAVE_AV_CODEC_FLAGS@)
+diff --git a/src/ppb_video_decoder.c b/src/ppb_video_decoder.c
+index eb150725..23647cdd 100644
+--- a/src/ppb_video_decoder.c
++++ b/src/ppb_video_decoder.c
+@@ -70,6 +70,11 @@
+ #define AV_CODEC_ID_H264        CODEC_ID_H264
+ #endif // !HAVE_AVCodecID
+ 
++#if !HAVE_AV_CODEC_FLAGS
++#define AV_CODEC_CAP_TRUNCATED  CODEC_CAP_TRUNCATED
++#define AV_CODEC_FLAG_TRUNCATED CODEC_FLAG_TRUNCATED
++#endif // !HAVE_AV_CODEC_FLAGS
++
+ enum hwdec_api_e {
+     HWDEC_NONE = 0,
+     HWDEC_VAAPI,
+@@ -620,9 +625,9 @@ initialize_decoder(struct pp_video_decoder_s *vd)
+         goto err;
+     }
+ 
+-    if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
+-        trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
+-        vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
++    if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
++        trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
++        vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
+     }
+ 
+     vd->avctx->opaque = vd;
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
index ea0561a19573..ffb3b7a382cb 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,11 @@ RDEPEND="${COMMON_DEPEND}
 	www-plugins/adobe-flash:22[abi_x86_64,ppapi(+)]
 	"
 
-PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.9-ioctl.patch" )
+PATCHES=(
+	"${FILESDIR}/0.3.5-cmake.patch"
+	"${FILESDIR}/0.3.9-ioctl.patch"
+	"${FILESDIR}/${P}-ffmpeg-4.patch"
+)
 DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
 
 src_configure() {