commit: 3b2c32569270c1fb2062436efae206e4be737349 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon May 14 21:48:25 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon May 14 21:48:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2c3256
media-video/makemkv: Patch for compatibility with ffmpeg 4 Closes: https://bugs.gentoo.org/655488 Package-Manager: Portage-2.3.36, Repoman-2.3.9 media-video/makemkv/files/makemkv-ffmpeg.patch | 25 +++++++++++++++++++++++++ media-video/makemkv/makemkv-1.12.2.ebuild | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch new file mode 100644 index 00000000000..930c144d263 --- /dev/null +++ b/media-video/makemkv/files/makemkv-ffmpeg.patch @@ -0,0 +1,25 @@ +Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm +See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 +and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca +diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c +index 20db4e9..f08d53c 100644 +--- a/libffabi/src/ffabi.c ++++ b/libffabi/src/ffabi.c +@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n + info->profile : FF_PROFILE_UNKNOWN; + + if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0) +- ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + if (argp) { + for (i=0;argp[i];i+=2) { +@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod + info->delay = (int32_t)ctx->avctx->delay; + info->flags = 0; + +- if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0) ++ if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0) + info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER; + + return 0; diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild index bcc7cf5092e..e5003042929 100644 --- a/media-video/makemkv/makemkv-1.12.2.ebuild +++ b/media-video/makemkv/makemkv-1.12.2.ebuild @@ -39,7 +39,7 @@ RDEPEND="${DEPEND} CONFIG_CHECK="~CHR_DEV_SG" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${PN}-path.patch ) +PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch ) src_configure() { # See bug #439380.
