Attachment 251720 Details for Bug 279847 – + sort out Makefile

[patch] + sort out Makefile

blender.diff (text/plain), 24.22 KB, created by Vladimir Druzenko on 2024-06-27 11:15:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-06-27 11:15:33 UTC

Size: 24.22 KB

patch

obsolete

>diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
>index bc793fa69cfd..839db4db89eb 100644
>--- a/graphics/blender/Makefile
>+++ b/graphics/blender/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	blender
>-DISTVERSION=	4.0.2
>-PORTREVISION=	1
>+DISTVERSION=	4.1.1
> CATEGORIES=	graphics multimedia
> MASTER_SITES=	http://download.blender.org/source/ \
> 		http://mirror.cs.umn.edu/blender.org/source/ \
>@@ -28,30 +27,31 @@ RUN_DEPENDS=	${PYNUMPY}
> # libboost_regex.so just acts as a placeholder; several boost
> # 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 eigen:3 jpeg llvm:max=15 \
>-		python:3.10 shebangfix tar:xz xorg
>+USES=		cmake compiler:c++17-lang cpe eigen:3 jpeg llvm:build,lib,run pkgconfig \
>+		python:3.11 shebangfix tar:xz xorg
> USE_XORG=	x11 xext xfixes xmu xrender
> 
> SHEBANG_FILES=	scripts/modules/bl_i18n_utils/merge_po.py \
> 		scripts/modules/bl_i18n_utils/utils_rtl.py \
> 		scripts/modules/blend_render_info.py
> 
>+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD:INTEGER=17 \
>+		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}"
> .if defined(WITH_DEBUG)
>-CMAKE_ARGS=	-DWITH_GHOST_DEBUG:BOOL=ON
>+CMAKE_ARGS+=	-DWITH_GHOST_DEBUG:BOOL=ON
> .endif
>-CMAKE_ON=	WITH_AUDASPACE WITH_BOOST WITH_GHOST_X11 WITH_GHOST_XDND WITH_HYDRA \
>-		WITH_IO_GPENCIL WITH_IO_PLY WITH_IO_STL WITH_IO_WAVEFRONT_OBJ \
>-		WITH_OPENGL_BACKEND WITH_PYTHON WITH_SYSTEM_EIGEN3 \
>+CMAKE_ON=	WITH_AUDASPACE WITH_BOOST WITH_CLANG WITH_GHOST_X11 WITH_GHOST_XDND \
>+		WITH_HYDRA WITH_IO_GPENCIL WITH_IO_PLY WITH_IO_STL WITH_IO_WAVEFRONT_OBJ \
>+		WITH_LLVM WITH_OPENGL_BACKEND WITH_PYTHON WITH_SYSTEM_EIGEN3 \
> 		WITH_SYSTEM_FREETYPE WITH_X11_XINPUT WITH_X11_XF86VMODE WITH_X11_XFIXES
>-CMAKE_OFF=	WITH_GHOST_SDL WITH_GHOST_WAYLAND_DBUS WITH_INSTALL_PORTABLE \
>-		WITH_MATERIALX WITH_MEM_JEMALLOC WITH_MEM_VALGRIND WITH_NANOVDB \
>-		WITH_PYTHON_INSTALL WITH_PYTHON_INSTALL_NUMPY
>+CMAKE_OFF=	WITH_GHOST_SDL WITH_INSTALL_PORTABLE LLVM_STATIC WITH_MATERIALX \
>+		WITH_MEM_JEMALLOC WITH_MEM_VALGRIND WITH_NANOVDB WITH_PYTHON_INSTALL \
>+		WITH_PYTHON_INSTALL_NUMPY
> 
> CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
> CFLAGS_gcc=	-Wno-float-conversion
> CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
>-LDFLAGS+=	-lexecinfo
>+LDFLAGS+=	-lexecinfo -Wl,--undefined-version
> 
> SUB_FILES=	blender
> PLIST_SUB+=	VER=${DISTVERSION:R}
>@@ -80,14 +80,12 @@ CYCLES_LDFLAGS=			-L${LOCALBASE}/lib -lgflags
> CYCLES_EMBR_IMPLIES=		CYCLES
> CYCLES_EMBR_LIB_DEPENDS=	libembree3.so:graphics/embree
> CYCLES_EMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
>+CYCLES_ONEAPI_LIB_DEPENDS=	libtbb.so:devel/onetbb
>+CYCLES_ONEAPI_CMAKE_BOOL=	WITH_CYCLES_DEVICE_ONEAPI
> CYCLES_OSL_IMPLIES=		CYCLES OPENEXR PUGIXML
>-CYCLES_OSL_BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
> CYCLES_OSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
>-CYCLES_OSL_RUN_DEPENDS=		llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
>-CYCLES_OSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
>-CYCLES_OSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
>-				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
>-				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
>+CYCLES_OSL_CMAKE_BOOL=		WITH_CYCLES_OSL
>+CYCLES_OSL_CMAKE_ON=		-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
> DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
> DRACO_CMAKE_BOOL=		WITH_DRACO
> EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
>@@ -101,11 +99,16 @@ FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
> 				libfftw3f.so:math/fftw3-float
> FFTW3_CMAKE_BOOL=		WITH_FFTW3
> FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
>+FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
>+FRIBIDI_CMAKE_BOOL=		WITH_FRIBIDI
>+HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
>+HARFBUZZ_CMAKE_BOOL=		WITH_HARFBUZZ
> HARU_LIB_DEPENDS=		libhpdf.so:print/libharu
> HARU_CMAKE_BOOL=		WITH_HARU
> HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
> HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
> HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
>+INPUT_NDOF_LIB_DEPENDS=		libspnav.so:misc/libspnav
> INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
> JACK_LIB_DEPENDS=		libjack.so:audio/jack
> JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
>@@ -129,6 +132,7 @@ OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
> 				libyaml-cpp.so:devel/yaml-cpp \
> 				libexpat.so:textproc/expat2 \
> 				libpystring.so:devel/pystring
>+OPENCOLORIO_USES=		minizip
> OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
> OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
> 				libOpenEXR.so:graphics/openexr
>@@ -167,9 +171,9 @@ TBB_CMAKE_BOOL=			WITH_TBB
> THUMBNAILER_CMAKE_BOOL=		WITH_BLENDER_THUMBNAILER
> TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
> TRACE_CMAKE_BOOL=		WITH_POTRACE
>+USD_IMPLIES=			TBB
> USD_BROKEN=			require devel/tbb, which conflicts with devel/onetbb: \
> 				https://github.com/PixarAnimationStudios/OpenUSD/issues/1650
>-USD_IMPLIES=			TBB
> USD_LIB_DEPENDS=		libusd_usd.so:misc/usd
> USD_CMAKE_BOOL=			WITH_USD
> VULKAN_BUILD_DEPENDS=		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
>@@ -183,7 +187,7 @@ WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.15:graphics/wayland-protocols \
> 				wayland>=1.12:graphics/wayland \
> 				libdecor>0:x11-toolkits/libdecor
> WAYLAND_LIB_DEPENDS=		libxkbcommon.so:x11/libxkbcommon
>-WAYLAND_USES=			pkgconfig
>+#WAYLAND_USES=			pkgconfig
> WAYLAND_CMAKE_BOOL=		WITH_GHOST_WAYLAND WITH_GHOST_WAYLAND_LIBDECOR \
> 				WITH_GHOST_WAYLAND_DYNLOAD
> WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
>diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options
>index fa8db0787cfc..0a71f4221ba8 100644
>--- a/graphics/blender/Makefile.options
>+++ b/graphics/blender/Makefile.options
>@@ -8,15 +8,18 @@ OPTIONS_DEFINE=		\
> 	COMPOSITOR	\
> 	CYCLES		\
> 	CYCLES_EMBR	\
>+	CYCLES_ONEAPI	\
> 	CYCLES_OSL	\
> 	DRACO		\
> 	EBOOL		\
> 	FFMPEG		\
> 	FFTW3		\
> 	FREESTYLE	\
>+	FRIBIDI		\
>+	HARFBUZZ	\
>+	HARU		\
> 	HEADLESS	\
> 	INPUT_NDOF	\
>-	HARU		\
> 	JACK		\
> 	LZO		\
> 	LZMA		\
>@@ -59,13 +62,16 @@ OPTIONS_DEFAULT=	\
> 	COLLADA		\
> 	COMPOSITOR	\
> 	CYCLES		\
>+	CYCLES_ONEAPI	\
> 	DRACO		\
> 	EBOOL		\
> 	FFMPEG		\
> 	FFTW3		\
> 	FREESTYLE	\
>-	INPUT_NDOF	\
>+	FRIBIDI		\
>+	HARFBUZZ	\
> 	HARU		\
>+	INPUT_NDOF	\
> 	LZO		\
> 	LZMA		\
> 	MENU		\
>@@ -103,18 +109,21 @@ OPTIONS_DEFAULT_powerpc64le=	CAMERATRACK
> ALEMBIC_DESC=		Enable Alembic file support
> AVI_DESC=		Enable Blender's own AVI file support
> BULLET_DESC=		Bullet physics engine
>-CINEON_DESC=		CINEON and DPX graphics format support
> CAMERATRACK_DESC=	Camera tracking support (amd64/aarch64/powerpc64/powerpc64le only)
>+CINEON_DESC=		CINEON and DPX graphics format support
> COLLADA_DESC=		Enable read/write support for COLLADA files
> COMPOSITOR_DESC=	Use the tile-based nodal compositor
> CYCLES_DESC=		Cycles render engine support
> CYCLES_EMBR_DESC=	Embree support (amd64 only)
>+CYCLES_ONEAPI_DESC=	Enable Cycles oneAPI compute support
> CYCLES_OSL_DESC=	Shading support for the cycles render engine
> # this is required to support gltf import/export
> DRACO_DESC=		Install draco python module
> EBOOL_DESC=		Enable exact boolean support
> FFTW3_DESC=		Use fftw for smoke and audio effects
> FREESTYLE_DESC=		Enable advanced edges rendering
>+FRIBIDI_DESC=		Enable features using fribidi Unicode Bidirectional Algorithm
>+HARFBUZZ_DESC=		Enable features using harfbuzz OpenType text shaping engine
> HARU_DESC=		Enable libharu support
> HEADLESS_DESC=		Disable user interface (for render-farms)
> INPUT_NDOF_DESC=	Enable NDOF input device support
>@@ -140,7 +149,7 @@ THUMBNAILER_DESC=	Build blender thumbnailer
> TRACE_DESC=		Enable tracing image to GP stroke
> USD_DESC=		Universal Scene Description Support (aarch64 and amd64 only, broken)
> VULKAN_DESC=		Enable Vulkan as graphics backend (only for development)
>-WEBP_DESC=		Enable webp image support
> WAYLAND_DESC=		Wayland support
>+WEBP_DESC=		Enable webp image support
> XF86VMODE_DESC=		X11 video mode switching support
> XINPUT_DESC=		X11 Xinput (tablet) support
>diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
>index 305d16773f68..7213966a4928 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=	4.0.2
>-BLENDER_PY_VERSION=	3.10
>+BLENDER_BL_VERSION=	4.1.1
>+BLENDER_PY_VERSION=	3.11
>diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
>index f9eca168ebbe..b9bb602a8f8b 100644
>--- a/graphics/blender/distinfo
>+++ b/graphics/blender/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1702795201
>-SHA256 (blender-4.0.2.tar.xz) = aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3
>-SIZE (blender-4.0.2.tar.xz) = 73281252
>+TIMESTAMP = 1717498075
>+SHA256 (blender-4.1.1.tar.xz) = 4fbb3af64d3f84df5c7103748454226c1885c1ac2ed5373d0cea1e80e82c0848
>+SIZE (blender-4.1.1.tar.xz) = 82146268
>diff --git a/graphics/blender/files/patch-intern_cycles_kernel_osl_CMakeLists.txt b/graphics/blender/files/patch-intern_cycles_kernel_osl_CMakeLists.txt
>deleted file mode 100644
>index 75eb51baeff8..000000000000
>--- a/graphics/blender/files/patch-intern_cycles_kernel_osl_CMakeLists.txt
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- intern/cycles/kernel/osl/CMakeLists.txt.orig	2023-09-27 15:54:37 UTC
>-+++ intern/cycles/kernel/osl/CMakeLists.txt
>-@@ -33,6 +33,7 @@ set(LIB
>-   ${OPENIMAGEIO_LIBRARIES}
>-   ${PUGIXML_LIBRARIES}
>-   ${CLANG_LIBRARIES}
>-+  ${CMAKE_INSTALL_PREFIX}/llvm%%LLVM_VER%%/lib/libclangSupport.a
>-   ${LLVM_LIBRARY}
>- )
>- 
>diff --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist
>index 01c16d4f7e29..0b1f344ec1d4 100644
>--- a/graphics/blender/pkg-plist
>+++ b/graphics/blender/pkg-plist
>@@ -6,6 +6,7 @@ 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
>+%%DATADIR%%/%%VER%%/datafiles/assets/geometry_nodes/smooth_by_angle.blend
> %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/config.ocio
> %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_desat_33.cube
> %%OPENCOLORIO%%%%DATADIR%%/%%VER%%/datafiles/colormanagement/filmic/filmic_to_0-35_1-30.spi1d
>@@ -40,6 +41,7 @@ share/applications/blender.desktop
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansHebrew-Regular.woff2
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansJavanese-Regular.woff2
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansKannada-VariableFont_wdth,wght.woff2
>+%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansKhmer-VariableFont_wdth,wght.woff2
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansMalayalam-VariableFont_wdth,wght.woff2
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansMath-Regular.woff2
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/NotoSansMyanmar-Regular.woff2
>@@ -194,7 +196,6 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.rip.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.rip_edge.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.spin.dat
>-%%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.spin.duplicate.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.vertices_smooth.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.node.links_cut.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.paint.eyedropper_add.dat
>@@ -239,10 +240,12 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.transform.vertex_random.dat
> %%DATADIR%%/%%VER%%/datafiles/icons/ops.view3d.ruler.dat
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ab/LC_MESSAGES/blender.mo
>+%%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/be/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ar/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/bg/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ca/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/cs/LC_MESSAGES/blender.mo
>+%%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/da/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/de/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/el/LC_MESSAGES/blender.mo
> %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/eo/LC_MESSAGES/blender.mo
>@@ -569,7 +572,6 @@ share/applications/blender.desktop
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_float.oso
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_vector.oso
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_vector_non_uniform.oso
>-%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_musgrave_texture.oso
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_noise.h
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_noise_texture.oso
> %%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_normal.oso
>@@ -686,7 +688,9 @@ share/applications/blender.desktop
> %%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_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel_osl.cu
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/kernel_shader_raytrace.cu
>+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/device/optix/services_optix.cu
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/adaptive_sampling.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/aov_passes.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/film/cryptomatte_passes.h
>@@ -800,7 +804,6 @@ share/applications/blender.desktop
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/math.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/math_util.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/node_types_template.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/noise.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/svm/noisetex.h
>@@ -829,6 +832,7 @@ share/applications/blender.desktop
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/color.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/differential.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/lookup_table.h
>+%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/nanovdb.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/util/profiling.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/atomic.h
> %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/util/color.h
>@@ -1007,6 +1011,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/export_fbx_bin.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/fbx2json.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/fbx_utils.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/fbx_utils_threading.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/import_fbx.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/json2fbx.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_fbx/parse_fbx.py
>@@ -1020,6 +1025,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_math.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_ui.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_utils.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_animation.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channel_target.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channels.py
>@@ -1032,12 +1038,12 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_keyframes.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_scene_animation.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_tracks.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/gltf2_blender_gather_animation_sampling_cache.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/armature/armature_action_sampled.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/armature/armature_channel_target.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/armature/armature_channels.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/armature/armature_keyframes.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/armature/armature_sampler.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/gltf2_blender_gather_animation_sampling_cache.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/object/gltf2_blender_gather_object_action_sampled.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/object/gltf2_blender_gather_object_channel_target.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/animation/sampled/object/gltf2_blender_gather_object_channels.py
>@@ -1066,6 +1072,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_tree.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_get.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/extensions/gltf2_blender_gather_materials_anisotropy.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/extensions/gltf2_blender_gather_materials_clearcoat.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/extensions/gltf2_blender_gather_materials_emission.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/extensions/gltf2_blender_gather_materials_ior.py
>@@ -1082,14 +1089,9 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/gltf2_blender_gather_texture.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/gltf2_blender_gather_texture_info.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/material/gltf2_blender_search_node_tree.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_ior.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_anisotropy.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_sheen.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_specular.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_transmission.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_unlit.py
>-%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_volume.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation_node.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation_utils.py
>@@ -1099,6 +1101,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_image.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_light.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_material.py
>+%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_material_utils.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_node.py
> %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
>@@ -1233,6 +1236,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/README.md
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/__init__.py
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/config.py
>+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/contour_curves.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
>@@ -1240,10 +1244,12 @@ share/applications/blender.desktop
> %%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/texture_reaction_diffusion.py
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/tissue_properties.py
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/utils.py
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/utils_pip.py
> %%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/uv_to_mesh.py
>+%%DATADIR%%/%%VER%%/scripts/addons/mesh_tissue/weight_reaction_diffusion.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
>@@ -1515,12 +1521,6 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/sterosphere.py
> %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/torus.py
> %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/twisted_torus.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/Chongqing.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/Kinshasa.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/London.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/New_York.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/Sao_Paulo.py
>-%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/sun_position/Sydney.py
> %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/01_(4800K)_Direct_Sun.py
> %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/02_(5400K)_High_Noon_Sun.py
> %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/03_(6000K)_Daylight_Window.py
>@@ -1997,6 +1997,7 @@ share/applications/blender.desktop
> %%DATADIR%%/%%VER%%/scripts/presets/cycles/sampling/Preview.py
> %%DATADIR%%/%%VER%%/scripts/presets/cycles/viewport_sampling/Final.py
> %%DATADIR%%/%%VER%%/scripts/presets/cycles/viewport_sampling/Preview.py
>+%%DATADIR%%/%%VER%%/scripts/presets/eevee/raytracing/Default.py
> %%DATADIR%%/%%VER%%/scripts/presets/ffmpeg/DVD_(note_colon__this_changes_render_resolution).py
> %%DATADIR%%/%%VER%%/scripts/presets/ffmpeg/H264_in_MP4.py
> %%DATADIR%%/%%VER%%/scripts/presets/ffmpeg/H264_in_Matroska.py
>@@ -2127,6 +2128,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/anim.py
> %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/asset_shelf.py
> %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/generic_ui_list.py
> %%DATADIR%%/%%VER%%/scripts/startup/bl_ui/node_add_menu.py
>@@ -2254,6 +2256,7 @@ share/applications/blender.desktop
> %%DOCSDIR%%/license/GPL-3.0.txt
> %%DOCSDIR%%/license/GPL-license.txt
> %%DOCSDIR%%/license/MIT.txt
>+%%DOCSDIR%%/license/MPL-2.0.txt
> %%DOCSDIR%%/license/OpenColorIO.txt
> %%DOCSDIR%%/license/OpenSSL.txt
> %%DOCSDIR%%/license/Python.txt

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 279847: 251557 | 251566 | 251719 | 251720