From nobody Thu Apr 27 19:13:00 2023 X-Original-To: dev-commits-ports-main@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 4Q6lkN6LZcz47pkf; Thu, 27 Apr 2023 19:13:00 +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 4Q6lkN2YFxz4CTt; Thu, 27 Apr 2023 19:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682622780; 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=4sfeWEFk0MzTVComrwx5ZGNhRTJwxCpYqhHxiNd7BqA=; b=tcgTiHnom9TRhpI82+ShR6vVsVXWBePDo7NOkeJ85SySDIMA081eVxOI4BXSHsp2dJVns9 EPBD/nkffGMUyfMyXEnpWBry0nMie35swITMXiKLYIV27WwFO0wpOsrR80PN7C+7IM3v+U rnAvT5ne1OygDWcPCE59yvXXY4QS//MT7FEUFQ0NB5qyM+18tCic5ZPVUZ4xRPZVR8vxns LHWrcOiCCPrgodrb8ugutiMl/S4XNYobCG7dP9GAWNi7dAmGQVEL3mAevBH+QkmFfaxH8Q ufJknek7uoXrSei1WAjizm245kF+sm1Z7CMuM58u92KieqhQkKCBpwOmSdTD0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682622780; 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=4sfeWEFk0MzTVComrwx5ZGNhRTJwxCpYqhHxiNd7BqA=; b=vP7hzYdac7Q9v0xzQnHsuIq3JAvDHsQsiWHkbfcBrMu9hoRJNH791q/uhs/7COaDTQyaxk qMCV+L/WryPJjj5bSbF9YUwY2lVoLlpsrLMsRxN6El5tjgzx8Hra08t2q2Sa7n7EQPYsTw K/bueCzWHy+1M7Fl0NCoNG3bvgT4Agi2TeknOWs9/Wz8+EXckHbCnNr2vNd0ligB3XhHnx p6XZWHfPpH6hn8ukoyxBHMSKQWU2e7wMeaeXmL/6vdkjJy7WM6I3Y9LY4G2djM8Keb7lzd 7CyJ9U4FCc6SIlRQGN3bssUbZrzsKU945LJF+z1bWXCsV2HAdbd4PTL+g/PUPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682622780; a=rsa-sha256; cv=none; b=Mo0xY1DoFUZ8xMY6XF4sBfyXdIbTY9cCO7pfhD7QvCElne7gyDO8Tk5+cl10jqxYrVpkTX InuwTmCXJry3fySMBHbHDHpd5BK1eDhe7EyK9VwhcWprn1X9kDHLdP1l9F/ZxVJDofMXQM o7GzC7K6+bFT+CMF8uH8kjGecdHlpBTUQ7Gv5nVXVhBoX/aDxgrXl6xgS7RuY9XQAqGtJ2 tZhIP+YQGP6qSgf9G7tXU0QAZiW9UDZ65PaK/qpu6zSMuxClJz+bNEa0vI5jBWoOZ7IJ9E Uhz9lhkvoEociIO2xY9nk/bvMhdg9FVr7wz2GMKhvdibAxlIKhFTZrh7DVSC1w== 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 4Q6lkN1d5czVRJ; Thu, 27 Apr 2023 19:13:00 +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 33RJD097063429; Thu, 27 Apr 2023 19:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RJD0fA063428; Thu, 27 Apr 2023 19:13:00 GMT (envelope-from git) Date: Thu, 27 Apr 2023 19:13:00 GMT Message-Id: <202304271913.33RJD0fA063428@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 5285305165ea - main - graphics/blender-lts29: update to 2.93.17 LTS release (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5285305165ea88c00903ea289012ab1d60e59aa4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5285305165ea88c00903ea289012ab1d60e59aa4 commit 5285305165ea88c00903ea289012ab1d60e59aa4 Author: Dima Panov AuthorDate: 2023-04-27 19:09:41 +0000 Commit: Dima Panov CommitDate: 2023-04-27 19:11:10 +0000 graphics/blender-lts29: update to 2.93.17 LTS release (+) Changelog: https://www.blender.org/download/lts/2-93/ Approved by: maintainer (implicit) --- graphics/blender-lts29/Makefile | 5 ++--- graphics/blender-lts29/Makefile.versions | 2 +- graphics/blender-lts29/distinfo | 6 +++--- ...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 ++++++++++++++++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/graphics/blender-lts29/Makefile b/graphics/blender-lts29/Makefile index 218f617dd89c..3438d79c0642 100644 --- a/graphics/blender-lts29/Makefile +++ b/graphics/blender-lts29/Makefile @@ -1,6 +1,5 @@ PORTNAME= blender -DISTVERSION= 2.93.11 -PORTREVISION= 10 +DISTVERSION= 2.93.17 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -15,7 +14,7 @@ WWW= https://www.blender.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt -BROKEN= fails to build +#BROKEN= fails to build NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= uses 64bit atomic functions diff --git a/graphics/blender-lts29/Makefile.versions b/graphics/blender-lts29/Makefile.versions index 34c34f3bfc83..81b922d75230 100644 --- a/graphics/blender-lts29/Makefile.versions +++ b/graphics/blender-lts29/Makefile.versions @@ -1,4 +1,4 @@ # Versions of Blender and its python dependency for use by depending ports, like add-ons -BLENDER_BL_VERSION= 2.93.11 +BLENDER_BL_VERSION= 2.93.17 BLENDER_PY_VERSION= 3.9 diff --git a/graphics/blender-lts29/distinfo b/graphics/blender-lts29/distinfo index 2fab1800dec4..bb4094d283f7 100644 --- a/graphics/blender-lts29/distinfo +++ b/graphics/blender-lts29/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665342163 -SHA256 (blender-2.93.11.tar.xz) = 7986110838e4a814c14c038aaaf4e517d2c0e46d076461eb66a2eecbfe7bdc58 -SIZE (blender-2.93.11.tar.xz) = 43043864 +TIMESTAMP = 1682621230 +SHA256 (blender-2.93.17.tar.xz) = 040e1381c8a37bb22e684b15ba4fecb78817fd13f1e4709d6d8c20800ac7cbfb +SIZE (blender-2.93.17.tar.xz) = 43033860 diff --git a/graphics/blender-lts29/files/patch-source_blender_blenkernel_intern_writeffmpeg.c b/graphics/blender-lts29/files/patch-source_blender_blenkernel_intern_writeffmpeg.c new file mode 100644 index 000000000000..5c4ce5259791 --- /dev/null +++ b/graphics/blender-lts29/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-lts29/files/patch-source_blender_imbuf_intern_anim__movie.c b/graphics/blender-lts29/files/patch-source_blender_imbuf_intern_anim__movie.c new file mode 100644 index 000000000000..eff908405e1e --- /dev/null +++ b/graphics/blender-lts29/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-lts29/files/patch-source_blender_imbuf_intern_indexer.c b/graphics/blender-lts29/files/patch-source_blender_imbuf_intern_indexer.c new file mode 100644 index 000000000000..401562c353dd --- /dev/null +++ b/graphics/blender-lts29/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 {