From nobody Sat Mar 25 14:56:01 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 4PkMb53rqWz41H5h; Sat, 25 Mar 2023 14:56:01 +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 4PkMb53Q4Gz437n; Sat, 25 Mar 2023 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679756161; 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=d9DsS1B9WtbdGl1+JeoHzSu+yafpnD9+wq1UCieFqGw=; b=JYpQmfcpfu57hWPZUkmIzuYKUdbU5ONe1Sxiq1tZ2OiZTr9w8H6JiECL7rm3Frb/Ga4Aax 4OAuRWee1CCLG1O4loI3d7zWMPzuP+lQ/IG+YhxxURcCzx0ekskf0ZxGYBtwi5peS/FHOA CPKmIFSGNd5SNtt+99F0Cfi3kKhq2ItCDpVHEvAxgSeWh7M5LXW+53cohRq0MKwNxjGPTl 0fbqniFIpYVsHGR15ZwmaD1XFOL0pruV/cyvDNjzxNZmN0cDMvE5ap5F9f9ViKF3ZNfvq0 9DycsQepTQQkxR/78zM8SQogFx5P9C5Go6X8mn0xNVfyXXOvLmxqknOIEz7nkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679756161; 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=d9DsS1B9WtbdGl1+JeoHzSu+yafpnD9+wq1UCieFqGw=; b=OL9KllhSGAFjWHqIcjYsaUC+fZSr4nHPV/MAJQiU3a9is70INAnbnLjRKHoToauvL5AEF/ hjgSms+gPsQ+/Rz/vcmJqajptOi8t4VxDtbPsDjmYCVI4EKfiJXicnv/jc6W22TOdph9bt H8yWu01RLDyRGpSm34/S7msun4nfaus81hX40Glh3AuBXv4VJ2ougKEbvvUwZRU0fhobvn J/H+3TiVC3binpeSg3mUuerEkmP1Qhb8AlxdPDeS/CS72/ctNVZFL5kcYWKvCBRwBGl7N/ OYlJzU7ztOFxKtFB+nKL89vaHp5+1Qo3kKF+IO3+fBsJr7+QlmiUGt8lWQ7olQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679756161; a=rsa-sha256; cv=none; b=jq+FnigLqw+7oMueUYCTFMBJhdNagrncWFWT3UqGnqBD9t7gq4hifIUiHkK2DkdQbW2x1n lPKf49k4+pItlEHHypw9U+8McmVDiS6NEbYuQ9RiONmEROTWK6fGQ4CHr8lk/s2epvnoft QZ0d+Kpa9Zp9j2nB7YIDykZ1FtevblmrJDRjWhrmJYxhLwWvC7n4DfUFIeluPDpaAzA2QX vXPNeuM5xYnqORvEwzIQ1DpnV5a06F8u0ogFOPeIgUBfhaCTAjTffS4ALeMj0SBgRASRqy 5EdnGVYMGSH3XVzdMP/Px4BPo6cdQFtdsH5OptoBye48Q/doWFGYPmltRC4kog== 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 4PkMb52Tghz13Fb; Sat, 25 Mar 2023 14:56:01 +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 32PEu1ab064487; Sat, 25 Mar 2023 14:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PEu168064486; Sat, 25 Mar 2023 14:56:01 GMT (envelope-from git) Date: Sat, 25 Mar 2023 14:56:01 GMT Message-Id: <202303251456.32PEu168064486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 0ed9c88a8c2d - main - graphics/blender: Fix compatibility with FFmpeg 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ed9c88a8c2de8744cb63163bdff9f9e4a71693e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ed9c88a8c2de8744cb63163bdff9f9e4a71693e commit 0ed9c88a8c2de8744cb63163bdff9f9e4a71693e Author: Daniel Engberg AuthorDate: 2023-03-25 14:48:29 +0000 Commit: Daniel Engberg CommitDate: 2023-03-25 14:48:33 +0000 graphics/blender: Fix compatibility with FFmpeg 6.0 Fix build with FFmpeg 6.0 Source: https://github.com/archlinux/svntogit-community/blob/master/blender/trunk/blender-ffmpeg6.patch PR: 270275 Reviewed by: Shane Ambler (maintainer) --- ...ch-source_blender_blenkernel_intern_writeffmpeg.c | 11 +++++++++++ .../patch-source_blender_imbuf_intern_anim__movie.c | 11 +++++++++++ .../patch-source_blender_imbuf_intern_indexer.c | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c b/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c new file mode 100644 index 000000000000..5c4ce5259791 --- /dev/null +++ b/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c @@ -0,0 +1,11 @@ +--- source/blender/blenkernel/intern/writeffmpeg.c.orig 2022-11-08 13:50:16 UTC ++++ source/blender/blenkernel/intern/writeffmpeg.c +@@ -855,7 +855,7 @@ static AVStream *alloc_video_stream(FFMpegContext *con + 255); + st->avg_frame_rate = av_inv_q(c->time_base); + +- if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { ++ if (codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) { + c->thread_count = 0; + } + else { diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c b/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c new file mode 100644 index 000000000000..eff908405e1e --- /dev/null +++ b/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c @@ -0,0 +1,11 @@ +--- source/blender/imbuf/intern/anim_movie.c.orig 2022-11-04 00:33:07 UTC ++++ source/blender/imbuf/intern/anim_movie.c +@@ -554,7 +554,7 @@ static int startffmpeg(struct anim *anim) + avcodec_parameters_to_context(pCodecCtx, video_stream->codecpar); + pCodecCtx->workaround_bugs = FF_BUG_AUTODETECT; + +- if (pCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { ++ if (pCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) { + pCodecCtx->thread_count = 0; + } + else { diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c b/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c new file mode 100644 index 000000000000..401562c353dd --- /dev/null +++ b/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c @@ -0,0 +1,20 @@ +--- source/blender/imbuf/intern/indexer.c.orig 2022-11-04 00:33:07 UTC ++++ source/blender/imbuf/intern/indexer.c +@@ -559,7 +559,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffm + av_dict_set(&codec_opts, "preset", "veryfast", 0); + av_dict_set(&codec_opts, "tune", "fastdecode", 0); + +- if (rv->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { ++ if (rv->codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) { + rv->c->thread_count = 0; + } + else { +@@ -872,7 +872,7 @@ static IndexBuildContext *index_ffmpeg_create_context( + avcodec_parameters_to_context(context->iCodecCtx, context->iStream->codecpar); + context->iCodecCtx->workaround_bugs = FF_BUG_AUTODETECT; + +- if (context->iCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) { ++ if (context->iCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) { + context->iCodecCtx->thread_count = 0; + } + else {