From nobody Sat May 13 08:35:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJJqn2JMTz4B6BL; Sat, 13 May 2023 08:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJJqn1fxMz3hVs; Sat, 13 May 2023 08:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683966949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zb93g6CcB/NaVb46gbcAAdoC3Db2lAtTLJdiWjDF0Co=; b=jaxd4id/04LITEd76zseQ6vI9bEf3aQ8XWmaV4DXUEnDt2LUby42Re9UFTTRQ9dZLBsdlm llhWBPG7Edxgh9iaZbfqltFudmD2tQgg5+YZGycgQaabC2z9YLBu2CLmxm11T8L42a8pO3 jAkr6mSZvbIIIg3NvQPySgsuyBuJaG2LDLH2+E4JGhFBmkkDMK2IIj8bYHbjB98VN76gHe JoqsjeWw3NvXRW5FetFUfkFKiPM8KsjVSh3TCIoB6K+yaU4RdGFgqHA2J1GP1myZujE01K kYh7vk2nW9Kw+/yYeDDmWpQovtqAaupsVGD9au8W74hxhmYDkbQ94XmiW5NxMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683966949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zb93g6CcB/NaVb46gbcAAdoC3Db2lAtTLJdiWjDF0Co=; b=H2l/FuQ31yFAXkCdpQ/A6Y0hoZ/Lryf+OgGiQ2BrMZ2ROOT2acdicvyLZ1UteCzMW51VzK LM/RMdFmXvyLvIbEspf4pC6M9haR/xahCPxw81WrmkVpUZDeuCQeVR6buxVXHc+1Bcp8HP XtWNfD9adCwHVIbVhzMYob1i+nbxT3pGvU30CTu8XGR8BtLTmoy0zRBt6SP9W8VYaqFk1G H+VoQMbUMmUIjN55x5PKVfPy0Z3w7EzQHemnI83H5rXpoKkPnVdQBNAemTBdDgJwMNvqP+ 5KTTKSNWEl5DE/X0t4L5E3C6sOsSJ+5/VoA4SleZI/9ivXxiGXQbOuO08imLiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683966949; a=rsa-sha256; cv=none; b=s9yBls/f4BeMu7EdZnGedXPhaMLsWMrjK8DcclgJY/svyYO3jYcWZtxtpSayg06m8DuCw2 Ksr1zhzEtGOBSCr8yVHupfk+EcdmrzmBJO63fQ+H0kzSVV4jqD1BU/cUIYgzH2feS/Yp0s aq7k9ISIHN6IsHGZq/X0EeeHkOI7hrTo5GsRjtWRYtQXubqRujzcvshLSGcF6GOEuSJ+Wt Usnlu2cguy+Qt/gsgzWjP2KC2DarWKo4LNjhNU4CzQdr+UxltXsigjtDNjS6h8mCsUvIqY ZGWbqvZhTVYVp274JGWI97D6ObMhJ5OIv+Jv1JgqartmDUiDkThtqewpkNdPcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJJqn0S3Zz198x; Sat, 13 May 2023 08:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34D8ZmGO026506; Sat, 13 May 2023 08:35:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D8Zm18026505; Sat, 13 May 2023 08:35:48 GMT (envelope-from git) Date: Sat, 13 May 2023 08:35:48 GMT Message-Id: <202305130835.34D8Zm18026505@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 16de7a66163d - main - multimedia/makemkv: Update ffmpeg to 6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16de7a66163d68f90879b6c5b9a24f82aa89cb87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=16de7a66163d68f90879b6c5b9a24f82aa89cb87 commit 16de7a66163d68f90879b6c5b9a24f82aa89cb87 Author: Felix Palmen AuthorDate: 2023-05-13 05:32:38 +0000 Commit: Felix Palmen CommitDate: 2023-05-13 08:35:29 +0000 multimedia/makemkv: Update ffmpeg to 6.0 Update the statically linked ffmpeg to 6.0. For now, this also allows to share the distfile with multimedia/ffmpeg Approved by: tcberner (mentor, implicit) --- multimedia/makemkv/Makefile | 3 ++- multimedia/makemkv/distinfo | 6 +++--- multimedia/makemkv/files/patch-ffmpeg6-compat | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index 8504405cc77c..3bba98b4c879 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -1,5 +1,6 @@ PORTNAME= makemkv DISTVERSION= 1.17.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.makemkv.com/download/:makemkv \ http://www.makemkv.com/download/old/:makemkv \ @@ -49,7 +50,7 @@ SUB_LIST= LINUXBASE=${LINUXBASE} PLIST_SUB= LINUXBASE=${LINUXBASE} FDKAACVERSION= 2.0.2 -FFMPEGVERSION= 5.1.2 +FFMPEGVERSION= 6.0 DISTFL_MAKEMKV= makemkv-oss-${DISTVERSION}.tar.gz \ makemkv-bin-${DISTVERSION}.tar.gz diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo index 0f85f152ef98..73d90ee0d198 100644 --- a/multimedia/makemkv/distinfo +++ b/multimedia/makemkv/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1676796381 +TIMESTAMP = 1683955871 SHA256 (makemkv-oss-1.17.3.tar.gz) = 16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb SIZE (makemkv-oss-1.17.3.tar.gz) = 6618376 SHA256 (makemkv-bin-1.17.3.tar.gz) = 1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0 SIZE (makemkv-bin-1.17.3.tar.gz) = 16402650 -SHA256 (ffmpeg-5.1.2.tar.xz) = 619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc -SIZE (ffmpeg-5.1.2.tar.xz) = 10004956 +SHA256 (ffmpeg-6.0.tar.xz) = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 +SIZE (ffmpeg-6.0.tar.xz) = 10234012 SHA256 (fdk-aac-2.0.2.tar.gz) = c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f SIZE (fdk-aac-2.0.2.tar.gz) = 2886434 diff --git a/multimedia/makemkv/files/patch-ffmpeg6-compat b/multimedia/makemkv/files/patch-ffmpeg6-compat new file mode 100644 index 000000000000..80b44064d07a --- /dev/null +++ b/multimedia/makemkv/files/patch-ffmpeg6-compat @@ -0,0 +1,11 @@ +--- libffabi/src/ffabi.c.orig 2023-05-13 05:57:55 UTC ++++ libffabi/src/ffabi.c +@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init( + #else + ctx->frame = av_frame_alloc(); + if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) { +- ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels, ++ ctx->frame_extended_data = av_calloc(ctx->avctx->channels, + sizeof(*ctx->frame_extended_data)); + if (!ctx->frame_extended_data) { + ffm_audio_encode_close(ctx);