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

diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
new file mode 100644 (file)
index 0000000..930c144
--- /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\r
+See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615\r
+and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca\r
+diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c\r
+index 20db4e9..f08d53c 100644\r
+--- a/libffabi/src/ffabi.c\r
++++ b/libffabi/src/ffabi.c\r
+@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n\r
+         info->profile : FF_PROFILE_UNKNOWN;\r
+ \r
+     if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)\r
+-        ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;\r
++        ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;\r
+ \r
+     if (argp) {\r
+         for (i=0;argp[i];i+=2) {\r
+@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod\r
+     info->delay = (int32_t)ctx->avctx->delay;\r
+     info->flags = 0;\r
+ \r
+-    if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)\r
++    if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)\r
+         info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;\r
+ \r
+     return 0;\r

diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild
index bcc7cf5092ec94b4f2869549c4f38003ce9ff85f..e5003042929ad372675ed3826a82971fa2f26951 100644 (file)
--- 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.