From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A66411382C5 for ; Mon, 14 May 2018 21:48:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7901E09AD; Mon, 14 May 2018 21:48:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3296E09AD for ; Mon, 14 May 2018 21:48:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96097335C75 for ; Mon, 14 May 2018 21:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 111182D for ; Mon, 14 May 2018 21:48:41 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1526334505.3b2c32569270c1fb2062436efae206e4be737349.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/makemkv/files/makemkv-ffmpeg.patch media-video/makemkv/makemkv-1.12.2.ebuild X-VCS-Directories: media-video/makemkv/files/ media-video/makemkv/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 3b2c32569270c1fb2062436efae206e4be737349 X-VCS-Branch: master Date: Mon, 14 May 2018 21:48:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ab00a9a7-a262-411f-b3f7-aca46a179f2a X-Archives-Hash: 43d90f1327746929986908107741c977 commit: 3b2c32569270c1fb2062436efae206e4be737349 Author: James Le Cuirot gentoo org> AuthorDate: Mon May 14 21:48:25 2018 +0000 Commit: James Le Cuirot gentoo 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.