| 1 |
commit: 5966e5e410ac11b1483f7d781a061ddf21f66cc1 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 25 21:25:10 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 25 21:25:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5966e5e4 |
| 7 |
|
| 8 |
media-video/makemkv: Bump to 1.12.3, remove old 1.12.2 |
| 9 |
|
| 10 |
The ffmpeg patch is no longer needed. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 13 |
|
| 14 |
media-video/makemkv/Manifest | 4 ++-- |
| 15 |
media-video/makemkv/files/makemkv-ffmpeg.patch | 25 ---------------------- |
| 16 |
...makemkv-1.12.2.ebuild => makemkv-1.12.3.ebuild} | 2 +- |
| 17 |
3 files changed, 3 insertions(+), 28 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest |
| 20 |
index 234d2b5ca36..c71ed4d6bf8 100644 |
| 21 |
--- a/media-video/makemkv/Manifest |
| 22 |
+++ b/media-video/makemkv/Manifest |
| 23 |
@@ -1,2 +1,2 @@ |
| 24 |
-DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94 |
| 25 |
-DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980 |
| 26 |
+DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac SHA512 79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b |
| 27 |
+DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195 SHA512 cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892 |
| 28 |
|
| 29 |
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 930c144d263..00000000000 |
| 32 |
--- a/media-video/makemkv/files/makemkv-ffmpeg.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,25 +0,0 @@ |
| 35 |
-Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm |
| 36 |
-See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 |
| 37 |
-and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca |
| 38 |
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c |
| 39 |
-index 20db4e9..f08d53c 100644 |
| 40 |
---- a/libffabi/src/ffabi.c |
| 41 |
-+++ b/libffabi/src/ffabi.c |
| 42 |
-@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n |
| 43 |
- info->profile : FF_PROFILE_UNKNOWN; |
| 44 |
- |
| 45 |
- if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0) |
| 46 |
-- ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; |
| 47 |
-+ ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; |
| 48 |
- |
| 49 |
- if (argp) { |
| 50 |
- for (i=0;argp[i];i+=2) { |
| 51 |
-@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod |
| 52 |
- info->delay = (int32_t)ctx->avctx->delay; |
| 53 |
- info->flags = 0; |
| 54 |
- |
| 55 |
-- if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0) |
| 56 |
-+ if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0) |
| 57 |
- info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER; |
| 58 |
- |
| 59 |
- return 0; |
| 60 |
|
| 61 |
diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.3.ebuild |
| 62 |
similarity index 98% |
| 63 |
rename from media-video/makemkv/makemkv-1.12.2.ebuild |
| 64 |
rename to media-video/makemkv/makemkv-1.12.3.ebuild |
| 65 |
index e5003042929..bcc7cf5092e 100644 |
| 66 |
--- a/media-video/makemkv/makemkv-1.12.2.ebuild |
| 67 |
+++ b/media-video/makemkv/makemkv-1.12.3.ebuild |
| 68 |
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND} |
| 69 |
|
| 70 |
CONFIG_CHECK="~CHR_DEV_SG" |
| 71 |
S="${WORKDIR}/${MY_P}" |
| 72 |
-PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch ) |
| 73 |
+PATCHES=( "${FILESDIR}"/${PN}-path.patch ) |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
# See bug #439380. |
Archives