3 files changed, 4 insertions, 30 deletions
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index ba708e433732..46a918de81f2 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,5 @@
-AUX makemkv-ffmpeg.patch 1162 BLAKE2B 17a0b850eedf830fdc95c01444be3783310b23a84db646f983c95d985f8e010a4633ee0bac175a7f27e0d26f4402e617afab18e95bf64d368601d4c19144f68e SHA512 52ac2ca86b621502f78f2f1a6dc3df713686369c4ec227597bd539b7bd55d4198d0710107d858d796d6e3503f9b9a9bc53e020e2eb0cd5a29c8897e4da00bd67
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94
-DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980
-EBUILD makemkv-1.12.2.ebuild 2868 BLAKE2B e03723f1f3ea7c21084fad26732cb43a2b770530aa6407804686f043268726dc3bf20bd6bf4a5f7e9083eb4ce44c67910e8f408c6c3edf520abe8ba88f04f6ad SHA512 c02583d2e9a2fb7721a383004f06c9f3f70b86c0d10d6915d18b2b9dda616f49ed4994bb8af31c36783105c919616cde76b197036edd9387fc177da1c0659a3e
+DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac SHA512 79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
+DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195 SHA512 cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892
+EBUILD makemkv-1.12.3.ebuild 2859 BLAKE2B fc304b3cc80241f3a2f07e020291ca76dca99b85b028b92a1833cde011fdbadc45b9a908371fc77f5c5f050f2a116599b0754d659f4bb4eac6c25e80d616fba6 SHA512 d8d8b25018297ecee548e46bc364953d2db2fe41cbe970b74933ec18400d03ab7317e2b5fe5606cce73de0bb31560b6bd17dbb3169f88807a9a7383de19f010c
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
deleted file mode 100644
index 930c144d263d..000000000000
--- a/media-video/makemkv/files/makemkv-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.3.ebuild
index e5003042929a..bcc7cf5092ec 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
 
 src_configure() {
 	# See bug #439380.