git: 26bd9af66df0 - main - graphics/blender: unbreak and update to 3.1.2 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Sat, 28 May 2022 23:00:08 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26bd9af66df08884f57805079ada9dbd19f02ac7

commit 26bd9af66df08884f57805079ada9dbd19f02ac7
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-05-28 22:53:23 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-05-28 22:53:23 +0000

    graphics/blender: unbreak and update to 3.1.2 release (+)
    
    Buldled Google log library was failed to link after recent boost update. Use devel/glog instead.
    Enable (and use by default) OpenJPEG (JPEG2000) option.
    Blender 3.1 switched to python-3.10, chase this dependency change.
    
    Approved by:    maintainer (implicit)
---
 graphics/blender/Makefile                          | 16 ++--
 graphics/blender/Makefile.options                  |  3 +
 graphics/blender/Makefile.versions                 |  4 +-
 ...ch-build__files_cmake_Modules_FindOpenEXR.cmake | 13 ----
 ...e_blender_imbuf_intern_openexr_openexr__api.cpp | 18 -----
 graphics/blender/pkg-plist                         | 85 +++++++++++++++++-----
 6 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index b10ff6847f83..2c7e9056d943 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	blender
-DISTVERSION=	3.0.0
-PORTREVISION=	2
+DISTVERSION=	3.1.2
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -25,15 +24,13 @@ 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.
 
-BROKEN=		ld: error: undefined symbol: google::InitVLOG3__(google::SiteFlag*, int*, char const*, int)
-
-USES=		cmake compiler:c++14-lang cpe gl jpeg python:3.9 shebangfix \
+USES=		cmake compiler:c++17-lang cpe gl jpeg python:3.10 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 INSTALLS_ICONS=	yes
-CMAKE_OFF=	WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \
+CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_CYCLES_LOGGING WITH_USD
 
@@ -59,8 +56,9 @@ ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
-CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV
-CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind
+CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
+CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
+				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
@@ -143,6 +141,8 @@ OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
+OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
+OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options
index c14128bcbb25..b90c07fdd8c8 100644
--- a/graphics/blender/Makefile.options
+++ b/graphics/blender/Makefile.options
@@ -36,6 +36,7 @@ OPTIONS_DEFINE=		\
 	OPENEXR 	\
 	OPENIMAGEIO	\
 	OPENIMAGEDN	\
+	OPENJPEG	\
 	OPENMP 		\
 	OPENSUBDIV	\
 	OPENVDB		\
@@ -83,6 +84,7 @@ OPTIONS_DEFAULT=	\
 	OPENCOLORIO	\
 	OPENEXR		\
 	OPENIMAGEIO	\
+	OPENJPEG	\
 	OPENSUBDIV	\
 	OPENVDB		\
 	PUGIXML		\
@@ -132,6 +134,7 @@ MOD_SMOKE_DESC=		Smoke simulation support
 OPENCOLORIO_DESC=	OpenColorIO-based color management support
 OPENIMAGEIO_DESC=	OpenImageIO image processing support
 OPENIMAGEDN_DESC=	OpenImageDenoise support
+OPENJPEG_DESC=		Enhanced JPEG (jpeg2000) graphics support
 OPENSUBDIV_DESC=	Use the OpenSubDiv library for surface subdivision
 OPENVDB_DESC=		Use openVDB library for volumetric data
 PUGIXML_DESC=		Enable pugixml support
diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
index 5085badecb04..52385fc4e092 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.0.0
-BLENDER_PY_VERSION=	3.9
+BLENDER_BL_VERSION=	3.1.2
+BLENDER_PY_VERSION=	3.10
diff --git a/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake b/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake
deleted file mode 100644
index ea60a8073ad9..000000000000
--- a/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- build_files/cmake/Modules/FindOpenEXR.cmake.orig	2020-09-25 06:53:19 UTC
-+++ build_files/cmake/Modules/FindOpenEXR.cmake
-@@ -34,9 +34,8 @@ ENDIF()
- SET(_openexr_libs_ver_init "2.0")
- 
- SET(_openexr_FIND_COMPONENTS
--  Half
-   Iex
--  IlmImf
-+  OpenEXR
-   IlmThread
-   Imath
- )
diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp b/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp
deleted file mode 100644
index 6d744f7258d8..000000000000
--- a/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- source/blender/imbuf/intern/openexr/openexr_api.cpp.orig	2020-11-25 08:31:32 UTC
-+++ source/blender/imbuf/intern/openexr/openexr_api.cpp
-@@ -38,6 +38,7 @@
- #include <ImfChannelList.h>
- #include <ImfCompression.h>
- #include <ImfCompressionAttribute.h>
-+#include <ImfFrameBuffer.h>
- #include <ImfIO.h>
- #include <ImfInputFile.h>
- #include <ImfOutputFile.h>
-@@ -94,6 +95,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
- 
- using namespace Imf;
- using namespace Imath;
-+typedef uint64_t Int64;
- 
- extern "C" {
- /* prototype */
diff --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist
index 2cc991115296..757403695ecf 100644
--- a/graphics/blender/pkg-plist
+++ b/graphics/blender/pkg-plist
@@ -23,8 +23,8 @@ share/applications/blender.desktop
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/vd16.spi1d
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx
 %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/luts/xyz_to_aces.spimtx
-%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf
-%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf
+%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf
+%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf
 %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.draw.dat
 %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.erase.dat
 %%DATADIR%%/%%VER%%/datafiles/icons/brush.gpencil_draw.fill.dat
@@ -212,6 +212,7 @@ share/applications/blender.desktop
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/id/LC_MESSAGES/blender.mo
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/it/LC_MESSAGES/blender.mo
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ja/LC_MESSAGES/blender.mo
+%%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ka/LC_MESSAGES/blender.mo
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ko/LC_MESSAGES/blender.mo
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ky/LC_MESSAGES/blender.mo
 %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/languages
@@ -423,6 +424,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/btrace/bTrace_panel.py
 %%DATADIR%%/%%VER%%/scripts/addons/btrace/bTrace_props.py
 %%DATADIR%%/%%VER%%/scripts/addons/camera_turnaround.py
+%%DATADIR%%/%%VER%%/scripts/addons/copy_global_transform.py
 %%DATADIR%%/%%VER%%/scripts/addons/curve_assign_shapekey.py
 %%DATADIR%%/%%VER%%/scripts/addons/curve_simplify.py
 %%DATADIR%%/%%VER%%/scripts/addons/curve_tools/__init__.py
@@ -445,6 +447,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/curve_tools/toolpath.py
 %%DATADIR%%/%%VER%%/scripts/addons/curve_tools/util.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/__init__.py
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/camera.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/engine.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/license/Apache_2.0.txt
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/license/ILM.txt
@@ -523,6 +526,7 @@ share/applications/blender.desktop
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_surface.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_volume.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_particle_info.oso
+%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_point_info.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_bsdf.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_hair_bsdf.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_volume.oso
@@ -547,6 +551,7 @@ share/applications/blender.desktop
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_value.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_curves.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_displacement.oso
+%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_map_range.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_math.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_rotate.oso
 %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_transform.oso
@@ -567,26 +572,26 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/embree.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/local.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/metal.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/nodes.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/shadow_all.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/traversal.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/types.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/util.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/volume.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/volume_all.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/volume.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/camera/camera.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/camera/projection.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/alloc.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_ashikhmin_shirley.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_ashikhmin_velvet.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_diffuse.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_diffuse_ramp.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_hair.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_diffuse.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_hair_principled.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_microfacet.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_microfacet_multi.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_hair.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_microfacet_multi_impl.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_microfacet_multi.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_microfacet.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_oren_nayar.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_phong_ramp.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_principled_diffuse.h
@@ -596,6 +601,7 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_toon.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_transparent.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_util.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bssrdf.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/emissive.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/volume.h
@@ -614,10 +620,15 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/config.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/globals.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/hip/kernel.cpp
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/metal/compat.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/metal/context_begin.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/metal/context_end.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/metal/globals.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/metal/kernel.metal
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/compat.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/globals.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel.cu
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel_shader_raytrace.cu
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel.cu
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/accumulate.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/adaptive_sampling.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/id_passes.h
@@ -625,20 +636,23 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/read.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/write_passes.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/attribute.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/curve.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/curve_intersect.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/curve.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/geom.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_curve.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_triangle.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_point.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_triangle_intersect.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_triangle_shader.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/motion_triangle.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/object.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/patch.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/point_intersect.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/point.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/primitive.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/shader_data.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/subd_triangle.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/triangle.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/triangle_intersect.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/triangle.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/geom/volume.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/init_from_bake.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/init_from_camera.h
@@ -656,13 +670,13 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/shader_eval.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/shadow_catcher.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/shadow_state_template.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/state.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/state_flow.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/state_template.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/state_util.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/subsurface.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/state.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/subsurface_disk.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/subsurface_random_walk.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/subsurface.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/integrator/volume_stack.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/background.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/light/common.h
@@ -700,17 +714,17 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/light_path.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/magic.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/map_range.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/mapping.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/mapping_util.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/math.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/mapping.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/math_util.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/math.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/mix.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/musgrave.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/noise.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/noisetex.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/normal.h
-%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/ramp.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/ramp_util.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/ramp.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/sepcomb_hsv.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/sepcomb_vector.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/sky.h
@@ -727,6 +741,7 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/wavelength.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/white_noise.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/wireframe.h
+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/tables.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/textures.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/types.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/color.h
@@ -974,6 +989,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/imp/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/imp/gltf2_io_binary.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/imp/gltf2_io_gltf.py
+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/imp/gltf2_io_user_extensions.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_obj/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_obj/export_obj.py
 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_obj/import_obj.py
@@ -1085,13 +1101,20 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tiny_cad/icons/VTX.png
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tiny_cad/icons/XALL.png
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/__init__.py
-%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/colors_groups_exchanger.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/README.md
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/config.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/curves_tools.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/dual_mesh.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/lattice.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/material_tools.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/numba_functions.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/polyhedra.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/tessellate_numpy.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/tissue_properties.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/utils_pip.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/utils.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/uv_to_mesh.py
+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/weight_tools.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tools/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tools/face_inset_fillet.py
 %%DATADIR%%/%%VER%%/scripts/addons/mesh_tools/mesh_cut_faces.py
@@ -1421,6 +1444,30 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/__init__.py
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/base_ui.py
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/df3_library.py
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.blobcapsule.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.blobcube.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.blobellipsoid.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.blobplane.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.blobsphere.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.box.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.cone.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.cylinder.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.heightfield.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.infinite_plane.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.isosurface.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.isosurfacebox.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.isosurfacesphere.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.isosurfacesupertorus.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.lathe.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.loft.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.parametric.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.polytocircle.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.prism.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.rainbow.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.sphere.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.spheresweep.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.superellipsoid.dat
+%%DATADIR%%/%%VER%%/scripts/addons/render_povray/icons/pov.add.torus.dat
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/object_curve_topology.py
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/object_gui.py
 %%DATADIR%%/%%VER%%/scripts/addons/render_povray/object_mesh_topology.py
@@ -1788,7 +1835,7 @@ share/applications/blender.desktop
 %%DATADIR%%/%%VER%%/scripts/presets/fluid/Oil.py
 %%DATADIR%%/%%VER%%/scripts/presets/fluid/Water.py
 %%DATADIR%%/%%VER%%/scripts/presets/framerate/120.py
-%%DATADIR%%/%%VER%%/scripts/presets/framerate/2%%PYTHON_VER%%8.py
+%%DATADIR%%/%%VER%%/scripts/presets/framerate/23.98.py
 %%DATADIR%%/%%VER%%/scripts/presets/framerate/24.py
 %%DATADIR%%/%%VER%%/scripts/presets/framerate/240.py
 %%DATADIR%%/%%VER%%/scripts/presets/framerate/25.py