git: 2233c84cffac - main - graphics/blender: update to 3.5.1 release (+)

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 26 May 2023 00:01:21 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2233c84cffacbdd23790ae539ddf15e80fafcf59

commit 2233c84cffacbdd23790ae539ddf15e80fafcf59
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2023-05-25 23:58:09 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2023-05-26 00:01:08 +0000

    graphics/blender: update to 3.5.1 release (+)
    
    Changelog:      https://wiki.blender.org/wiki/Reference/Release_Notes/3.5
                    https://wiki.blender.org/wiki/Reference/Release_Notes/3.5/Corrective_Releases
    
    Approved by:    maintainer (implicit)
    Sponsored by:   Serenity Cybersecurity, LLC
---
 graphics/blender/Makefile                          | 17 +++---
 graphics/blender/Makefile.versions                 |  2 +-
 graphics/blender/files/patch-CMakeLists.txt        |  4 +-
 .../files/patch-extern_sdlew_CMakeLists.txt        | 11 ----
 .../files/patch-intern_cycles_CMakeLists.txt       | 10 ++--
 .../patch-intern_locale_boost__locale__wrapper.cpp |  4 +-
 ...om_gltf2__io__draco__compression__extension.py} |  6 +-
 ...-source_blender_blenkernel_intern_writeffmpeg.c | 11 ----
 ...patch-source_blender_imbuf_intern_anim__movie.c | 11 ----
 .../patch-source_blender_imbuf_intern_indexer.c    | 20 -------
 .../files/patch-source_creator_symbols__unix.map   | 12 ----
 graphics/blender/pkg-plist                         | 70 +++++++++++++++-------
 12 files changed, 71 insertions(+), 107 deletions(-)

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index d8c85d06e802..c8ced4ff752e 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	blender
-DISTVERSION=	3.4.1
-PORTREVISION=	9
+DISTVERSION=	3.5.1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -27,18 +26,18 @@ RUN_DEPENDS=	${PYNUMPY}
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
-USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9 \
+USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9,max=15 \
 		python:3.10 shebangfix tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
-		WITH_CYCLES_LOGGING WITH_USD
+		WITH_USD
 
-SHEBANG_FILES=	release/scripts/modules/bl_i18n_utils/merge_po.py \
-		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
-		release/scripts/modules/blend_render_info.py
+SHEBANG_FILES=	scripts/modules/bl_i18n_utils/merge_po.py \
+		scripts/modules/bl_i18n_utils/utils_rtl.py \
+		scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
@@ -71,7 +70,9 @@ COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
-CYCLES_CMAKE_BOOL=		WITH_CYCLES
+CYCLES_CMAKE_BOOL=		WITH_CYCLES WITH_CYCLES_LOGGING
+CYCLES_LIB_DEPENDS=		libgflags.so:devel/gflags
+CYCLES_LDFLAGS=			-L${LOCALBASE}/lib -lgflags
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
index 1bf39e7e7d75..b76662169f30 100644
--- a/graphics/blender/Makefile.versions
+++ b/graphics/blender/Makefile.versions
@@ -1,4 +1,4 @@
 # Versions of Blender and its python dependency for use by depending ports, like add-ons
 
-BLENDER_BL_VERSION=	3.4.1
+BLENDER_BL_VERSION=	3.5.1
 BLENDER_PY_VERSION=	3.10
diff --git a/graphics/blender/files/patch-CMakeLists.txt b/graphics/blender/files/patch-CMakeLists.txt
index dd2e18a784f3..77cd3610c830 100644
--- a/graphics/blender/files/patch-CMakeLists.txt
+++ b/graphics/blender/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2022-11-18 15:14:53 UTC
+--- CMakeLists.txt.orig	2023-02-21 16:36:49 UTC
 +++ CMakeLists.txt
-@@ -824,11 +824,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES       
+@@ -859,11 +859,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID    
  set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
  set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)
  
diff --git a/graphics/blender/files/patch-extern_sdlew_CMakeLists.txt b/graphics/blender/files/patch-extern_sdlew_CMakeLists.txt
deleted file mode 100644
index 0b978dc9d619..000000000000
--- a/graphics/blender/files/patch-extern_sdlew_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- extern/sdlew/CMakeLists.txt.orig	2022-12-30 02:50:19 UTC
-+++ extern/sdlew/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(INC
- )
- 
- set(INC_SYS
--
-+  ${X11_X11_INCLUDE_PATH}
- )
- 
- set(SRC
diff --git a/graphics/blender/files/patch-intern_cycles_CMakeLists.txt b/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
index 0c94a20879db..aa861874e1fe 100644
--- a/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
+++ b/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
@@ -1,7 +1,7 @@
---- intern/cycles/CMakeLists.txt.orig	2019-07-31 13:03:30 UTC
+--- intern/cycles/CMakeLists.txt.orig	2023-02-15 14:56:19 UTC
 +++ intern/cycles/CMakeLists.txt
-@@ -260,9 +260,9 @@ if(WITH_CYCLES_DEBUG)
-   add_definitions(-DWITH_CYCLES_DEBUG)
+@@ -377,9 +377,9 @@ endif()
+   add_definitions(-DWITH_CYCLES_DEBUG_NAN)
  endif()
  
 -if(NOT OPENIMAGEIO_PUGIXML_FOUND)
@@ -10,5 +10,5 @@
 -endif()
 +#endif()
  
- include_directories(
-   SYSTEM
+ if(CYCLES_STANDALONE_REPOSITORY)
+   include_directories(../third_party/atomic)
diff --git a/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp b/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp
index 49f45e398f91..9b45d55d6278 100644
--- a/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp
+++ b/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp
@@ -5,9 +5,9 @@ Adding include as suggested by the compiler:
 "intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined 
 in header ‘<iostream>’; did you forget to ‘#include <iostream>’?"
 
---- intern/locale/boost_locale_wrapper.cpp
+--- intern/locale/boost_locale_wrapper.cpp.orig	2023-02-15 14:56:19 UTC
 +++ intern/locale/boost_locale_wrapper.cpp
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
  #include <stdio.h>
  
  #include "boost_locale_wrapper.h"
diff --git a/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py b/graphics/blender/files/patch-scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
similarity index 61%
rename from graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
rename to graphics/blender/files/patch-scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
index afa9d714f23b..034b17339531 100644
--- a/graphics/blender/files/patch-release_scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
+++ b/graphics/blender/files/patch-scripts_addons_io__scene__gltf2_io_com_gltf2__io__draco__compression__extension.py
@@ -1,6 +1,6 @@
---- release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig	2021-03-24 15:01:52 UTC
-+++ release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-@@ -44,7 +44,7 @@ def dll_path() -> Path:
+--- scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig	2023-02-15 14:57:11 UTC
++++ scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+@@ -33,7 +33,7 @@ def dll_path() -> Path:
          'win32': '{}.dll'.format(lib_name),
          'linux': 'lib{}.so'.format(lib_name),
          'darwin': 'lib{}.dylib'.format(lib_name)
diff --git a/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c b/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c
deleted file mode 100644
index 5c4ce5259791..000000000000
--- a/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index eff908405e1e..000000000000
--- a/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 401562c353dd..000000000000
--- a/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 {
diff --git a/graphics/blender/files/patch-source_creator_symbols__unix.map b/graphics/blender/files/patch-source_creator_symbols__unix.map
deleted file mode 100644
index b15fb080f4da..000000000000
--- a/graphics/blender/files/patch-source_creator_symbols__unix.map
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/creator/symbols_unix.map.orig	2022-12-30 02:55:12 UTC
-+++ source/creator/symbols_unix.map
-@@ -39,6 +39,9 @@ global:
-   realpath;
-   sched_*;
-   valloc;
-+  /* needed on FreeBSD */
-+  __progname;
-+  environ;
- local:
-   *;
- };
diff --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist
index eb5a33bb8f85..a16f560f8aab 100644
--- a/graphics/blender/pkg-plist
+++ b/graphics/blender/pkg-plist
@@ -3,6 +3,9 @@ bin/blender-bin
 %%THUMBNAILER%%bin/blender-thumbnailer
 %%DRACO%%%%PYTHON_SITELIBDIR%%/libextern_draco.so
 share/applications/blender.desktop
+%%DATADIR%%/%%VER%%/datafiles/assets/LICENSE
+%%DATADIR%%/%%VER%%/datafiles/assets/blender_assets.cats.txt
+%%DATADIR%%/%%VER%%/datafiles/assets/geometry_nodes/procedural_hair_node_assets.blend
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/config.ocio
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_false_color.spi3d
@@ -383,7 +386,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/animation/frame_current.py
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/animation/jump_frames.py
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/animation/motion_paths.py
-%%DATADIR%%/%%VER%%/scripts/addons/amaranth/animation/timeline_extra_info.py
+%%DATADIR%%/%%VER%%/scripts/addons/amaranth/animation/time_extra_info.py
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/misc/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/misc/color_management.py
 %%DATADIR%%/%%VER%%/scripts/addons/amaranth/misc/dupli_group_id.py
@@ -729,16 +732,23 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/surface_shader.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/volume_shader.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/volume_stack.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/area.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/background.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/common.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/distant.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/distribution.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/light.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/point.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/sample.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/jitter.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/spot.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/tree.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/triangle.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/lcg.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/mapping.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/mis.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/pattern.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/sobol_burley.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/tabulated_sobol.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/sample/util.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/ao.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/aov.h
@@ -807,7 +817,6 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/defines.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/half.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/hash.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_fast.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_float2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_float3.h
@@ -816,43 +825,47 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_int2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_int3.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_int4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_int8.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_intersect.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math_matrix.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/math.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/projection.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/rect.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/static_assert.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/texture.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/transform.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/transform_inverse.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float2.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/transform.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float2_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float3.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float3_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float3.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float4_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float8.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float4.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float8_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int2.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_float8.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int2_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int3.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int3_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int3.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int4_impl.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int8_impl.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_int8.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_spectrum.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar2_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar3.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar3_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar3.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar4_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint2.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uchar4.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint2_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint3.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint2.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint3_impl.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint3.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint4_impl.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_uint4.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types_ushort4.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/types.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/ui.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/version_update.py
 %%DATADIR%%/%%VER%%/scripts/addons/depsgraph_debug.py
@@ -862,7 +875,12 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/box_deform.py
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/draw_tools.py
+%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/icons/hide_off.png
+%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/icons/hide_on.png
+%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/icons/locked.png
+%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/icons/unlocked.png
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/import_brush_pack.py
+%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/layer_navigator.py
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/line_reshape.py
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/prefs.py
 %%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/rotate_canvas.py
@@ -1046,14 +1064,15 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_vnode.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/__init__.py
-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_constants.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_debug.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_extensions.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_lights_punctual.py
+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_path.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_variants.py
+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_binary_data.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_buffer.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
@@ -1205,7 +1224,10 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tools/vertex_align.py
 %%DATADIR%%/%%VER%%/scripts/addons/node_arrange.py
 %%DATADIR%%/%%VER%%/scripts/addons/node_presets.py
-%%DATADIR%%/%%VER%%/scripts/addons/node_wrangler.py
+%%DATADIR%%/%%VER%%/scripts/addons/node_wrangler/README.md
+%%DATADIR%%/%%VER%%/scripts/addons/node_wrangler/__init__.py
+%%DATADIR%%/%%VER%%/scripts/addons/node_wrangler/util.py
+%%DATADIR%%/%%VER%%/scripts/addons/node_wrangler/util_test.py
 %%DATADIR%%/%%VER%%/scripts/addons/object_boolean_tools.py
 %%DATADIR%%/%%VER%%/scripts/addons/object_carver/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/object_carver/carver_draw.py
@@ -1605,7 +1627,9 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/metarigs/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/metarigs/human.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/operators/__init__.py
+%%DATADIR%%/%%VER%%/scripts/addons/rigify/operators/action_layers.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/operators/copy_mirror_parameters.py
+%%DATADIR%%/%%VER%%/scripts/addons/rigify/operators/generic_ui_list.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/operators/upgrade_face.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/rig_lists.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/rig_ui_template.py
@@ -1654,6 +1678,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/rot_mode.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/ui.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/utils/__init__.py
+%%DATADIR%%/%%VER%%/scripts/addons/rigify/utils/action_layers.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/utils/animation.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/utils/bones.py
 %%DATADIR%%/%%VER%%/scripts/addons/rigify/utils/collections.py
@@ -1723,13 +1748,14 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/dopesheet_overlay.py
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/render.py
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/scene_tools.py
+%%DATADIR%%/%%VER%%/scripts/addons/storypencil/sound.py
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/synchro.py
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/ui.py
 %%DATADIR%%/%%VER%%/scripts/addons/storypencil/utils.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/__init__.py
+%%DATADIR%%/%%VER%%/scripts/addons/sun_position/draw.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/geo.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/hdr.py
-%%DATADIR%%/%%VER%%/scripts/addons/sun_position/north.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/properties.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/sun_calc.py
 %%DATADIR%%/%%VER%%/scripts/addons/sun_position/translations.py
@@ -2055,6 +2081,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/view3d.py
 %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/wm.py
 %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/__init__.py
+%%DATADIR%%/%%VER%%/scripts/startup/bl_ui/generic_ui_list.py
 %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/node_add_menu.py
 %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/node_add_menu_geometry.py
 %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/properties_animviz.py
@@ -2157,6 +2184,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/templates_py/operator_node.py
 %%DATADIR%%/%%VER%%/scripts/templates_py/operator_simple.py
 %%DATADIR%%/%%VER%%/scripts/templates_py/ui_list.py
+%%DATADIR%%/%%VER%%/scripts/templates_py/ui_list_generic.py
 %%DATADIR%%/%%VER%%/scripts/templates_py/ui_list_simple.py
 %%DATADIR%%/%%VER%%/scripts/templates_py/ui_menu.py
 %%DATADIR%%/%%VER%%/scripts/templates_py/ui_menu_simple.py