media-video/makemkv: Bump to 1.12.3, remove old 1.12.2

The ffmpeg patch is no longer needed.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 234d2b5ca363f739ddd518cf35dbad089b66a593..c71ed4d6bf86e251a03e8185332a1b246c5f1d45 100644 (file)
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+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

diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
deleted file mode 100644 (file)
index 930c144..0000000
--- 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\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.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.12.2.ebuild
rename to media-video/makemkv/makemkv-1.12.3.ebuild
index e5003042929ad372675ed3826a82971fa2f26951..bcc7cf5092ec94b4f2869549c4f38003ce9ff85f 100644 (file)
--- 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.