Date: Thu, 27 Apr 2023 19:13:00 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5285305165ea - main - graphics/blender-lts29: update to 2.93.17 LTS release (+) Message-ID: <202304271913.33RJD0fA063428@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5285305165ea88c00903ea289012ab1d60e59aa4 commit 5285305165ea88c00903ea289012ab1d60e59aa4 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2023-04-27 19:09:41 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> 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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271913.33RJD0fA063428>