graphics/blender: sort out Makefile, pet portclippy

- Remove removed and add new added by ustream build options. - Remove unused dependencies, unbundle EIGEN3 and LZO. - Fix IMLIES - make same as in upstream's CMakeLists.txt. - Make graphics/openimageio and graphics/tiff mandatory same as in upstream. - Adjust allowed ARCHS and OPTIONS_DEFAULT_* for allowed ARCHS. - Fix whitespaces in OPTIONS_DEFINE and OPTIONS_DEFAULT. - Pet portclippy and other small changes. PR: 279528 Approved by: Shane <FreeBSD@ShaneWare.Biz> (maintaner)
2024-11-18 00:10:04 +00:00 · 2024-06-09 19:24:20 +03:00 · 2024-06-09 19:24:20 +03:00 · 4d1c6bfa5e
commit 4d1c6bfa5e
parent fd63c37577
8 changed files with 257 additions and 298 deletions
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	blender
 DISTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@ -12,199 +13,189 @@ WWW=		https://www.blender.org/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt

-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
+ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64 powerpc64le riscv64
+ONLY_FOR_ARCHS_REASON=	static_assert(sizeof(unsigned long long) == sizeof(struct hipArray*))

 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libepoxy.so:graphics/libepoxy \
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
-		libboost_regex.so:devel/boost-libs \
+		libepoxy.so:graphics/libepoxy \
+		libOpenImageIO.so:graphics/openimageio \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
 		libzstd.so:archivers/zstd
 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 gl jpeg llvm:max=15 \
+USES=		cmake compiler:c++17-lang cpe eigen:3 jpeg llvm: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_USD

 SHEBANG_FILES=	scripts/modules/bl_i18n_utils/merge_po.py \
 		scripts/modules/bl_i18n_utils/utils_rtl.py \
 		scripts/modules/blend_render_info.py
+
+.if defined(WITH_DEBUG)
+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 \
+		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
+
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
-CFLAGS_i386=	-march=i586
 CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
-CXXFLAGS_i386=	-march=i586
 LDFLAGS+=	-lexecinfo

+SUB_FILES=	blender
 PLIST_SUB+=	VER=${DISTVERSION:R}
 OPTIONS_SUB=	yes
-SUB_FILES=	blender

 .include "${.CURDIR}/Makefile.options"

-ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
+ALEMBIC_IMPLIES=		OPENEXR
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
-# note that this needs to be set to match alembics hdf5 option
-ALEMBIC_HDF5_REQUIRES=		ALEMBIC
-ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
-ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
+ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
+CAMERATRACK_LIB_DEPENDS=	libglog.so:devel/glog
 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
-COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
-COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
-COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
-CYCLES_IMPLIES=			OPENIMAGEIO TBB
-CYCLES_CMAKE_BOOL=		WITH_CYCLES WITH_CYCLES_LOGGING
+COLLADA_USE=			GNOME=libxml2
+COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
+COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR_CPU
+CYCLES_IMPLIES=			TBB
 CYCLES_LIB_DEPENDS=		libgflags.so:devel/gflags
+CYCLES_CMAKE_BOOL=		WITH_CYCLES WITH_CYCLES_LOGGING
 CYCLES_LDFLAGS=			-L${LOCALBASE}/lib -lgflags
-CYCLESEMBR_IMPLIES=		CYCLES
-CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
-CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
-CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
-CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
-CYCLESOSL_IMPLIES=		CYCLES
-CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
-CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
+CYCLES_EMBR_IMPLIES=		CYCLES
+CYCLES_EMBR_LIB_DEPENDS=	libembree3.so:graphics/embree
+CYCLES_EMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
+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"
-CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
-CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
-DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
-EBOOL_CMAKE_BOOL=		WITH_GMP
+DRACO_CMAKE_BOOL=		WITH_DRACO
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
-FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
+EBOOL_CMAKE_BOOL=		WITH_GMP
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite
-FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
-FFTW3_CMAKE_BOOL=		WITH_FFTW3
+FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
+FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal \
+				-lflite_cmulex -lflite_usenglish
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3 \
 				libfftw3f.so:math/fftw3-float
-FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
+FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
-HARU_CMAKE_BOOL=		WITH_HARU
 HARU_LIB_DEPENDS=		libhpdf.so:print/libharu
-HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
+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_CMAKE_BOOL=		WITH_INPUT_NDOF
-JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
-LZO_CMAKE_BOOL=			WITH_LZO
+JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
 LZMA_CMAKE_BOOL=		WITH_LZMA
+LZO_LIB_DEPENDS=		liblzo2.so:archivers/lzo2
+LZO_CMAKE_BOOL=			WITH_LZO WITH_SYSTEM_LZO
 MENU_USES=			desktop-file-utils
-MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
-MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
-NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
-NLS_USES=			gettext iconv:lib,wchar_t
-OPENAL_CMAKE_BOOL=		WITH_OPENAL
+NLS_USES=			gettext-tools iconv:lib,wchar_t
+NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 OPENAL_USES=			openal:al,alut
-OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
+OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
-				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
-OPENCOLORIO_USES=		minizip:ng
-OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
-OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
+OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
-OPENIMAGEIO_IMPLIES=		OPENEXR TIFF PUGIXML
-OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
-OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
-OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
+OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
+OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENIMAGEDN_IMPLIES=		TBB
-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
+OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
+OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
-OPENPGL_ONLY_FOR_ARCHS=		amd64 armv6 armv7
-OPENPGL_ONLY_FOR_ARCHS_REASON=	requires supported SIMD ISA
-OPENPGL_CMAKE_BOOL=		WITH_CYCLES_PATH_GUIDING
 OPENPGL_LIB_DEPENDS=		libopenpgl.so:graphics/openpgl
-OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
+OPENPGL_CMAKE_BOOL=		WITH_CYCLES_PATH_GUIDING
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
-OPENVDB_IMPLIES=		TBB
+OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
+OPENVDB_IMPLIES=		OPENEXR TBB
+OPENVDB_LIB_DEPENDS=		libopenvdb.so:misc/openvdb
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
-OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
-				libopenvdb.so:misc/openvdb
-OPENXR_CMAKE_BOOL=		WITH_XR_OPENXR
 OPENXR_LIB_DEPENDS=		libopenxr_loader.so:graphics/openxr
-POTRACE_CMAKE_BOOL=		WITH_POTRACE
+OPENXR_CMAKE_BOOL=		WITH_XR_OPENXR
 POTRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
-PUGIXML_CMAKE_BOOL=		WITH_PUGIXML
+POTRACE_CMAKE_BOOL=		WITH_POTRACE
 PUGIXML_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
-PULSEAUDIO_CMAKE_BOOL=		WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
+PUGIXML_CMAKE_BOOL=		WITH_PUGIXML
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=		WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
 QUADRIFLOW_CMAKE_BOOL=		WITH_QUADRIFLOW
-RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
-SDL_CMAKE_BOOL=			WITH_SDL WITH_SDL_DYNLOAD
-SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
-SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
+SDL_USE=			SDL=sdl2
+SDL_CMAKE_BOOL=			WITH_SDL WITH_SDL_DYNLOAD
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
-TBB_CMAKE_BOOL=			WITH_TBB
+SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
+TBB_CMAKE_BOOL=			WITH_TBB
 THUMBNAILER_CMAKE_BOOL=		WITH_BLENDER_THUMBNAILER
-TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
-TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
-TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
+TRACE_CMAKE_BOOL=		WITH_POTRACE
+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
+VULKAN_LIB_DEPENDS=		libshaderc_shared.so:graphics/shaderc \
+				libSPIRV-Tools-shared.so:graphics/spirv-tools \
+				libvulkan.so:graphics/vulkan-loader
+VULKAN_CMAKE_BOOL=		WITH_VULKAN_BACKEND
+VULKAN_LDFLAGS=			-lshaderc_shared -lSPIRV-Tools-shared
 WAYLAND_CATEGORIES=		wayland
-WAYLAND_CMAKE_BOOL=		WITH_GHOST_WAYLAND
-WAYLAND_USES=			pkgconfig
 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
-WEBP_CMAKE_BOOL=		WITH_IMAGE_WEBP
+WAYLAND_USES=			pkgconfig
+WAYLAND_CMAKE_BOOL=		WITH_GHOST_WAYLAND WITH_GHOST_WAYLAND_LIBDECOR \
+				WITH_GHOST_WAYLAND_DYNLOAD
 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
-XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
-XINPUT_USE=			XORG=xi
-XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
+WEBP_CMAKE_BOOL=		WITH_IMAGE_WEBP
 XF86VMODE_USE=			XORG=xi,xxf86vm
-
-.if defined(WITH_DEBUG)
-CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
-.endif
+XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
+XINPUT_USE=			XORG=xi
+XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT

 .include <bsd.port.options.mk>

-.if ${ARCH} != amd64 && ${ARCH} != i386
+.if ${ARCH} != aarch64 && ${ARCH} != amd64
 CMAKE_ARGS+=	-DWITH_CPU_SIMD:BOOL=OFF
 .endif

--- a/graphics/blender/Makefile.options
+++ b/graphics/blender/Makefile.options
@ -1,43 +1,36 @@
 OPTIONS_DEFINE=		\
 	ALEMBIC		\
-	ALEMBIC_HDF5	\
 	AVI		\
-	BULLET 		\
-	CAMERATRACK 	\
-	CINEON 		\
+	BULLET		\
+	CAMERATRACK	\
+	CINEON		\
 	COLLADA		\
-	COMPOSITOR 	\
-	CYCLES 		\
-	CYCLESEMBR	\
-	CYCLESOSL 	\
-	DDS 		\
+	COMPOSITOR	\
+	CYCLES		\
+	CYCLES_EMBR	\
+	CYCLES_OSL	\
 	DRACO		\
 	EBOOL		\
-	FFMPEG 		\
-	FFTW3 		\
-	FRAMESERVER	\
+	FFMPEG		\
+	FFTW3		\
 	FREESTYLE	\
-	HDR 		\
-	HEADLESS 	\
+	HEADLESS	\
 	INPUT_NDOF	\
 	HARU		\
-	JACK 		\
+	JACK		\
 	LZO		\
 	LZMA		\
-	MENU 		\
-	MOD_BOOLEAN 	\
+	MENU		\
 	MOD_FLUID	\
-	MOD_OCEANSIM 	\
+	MOD_OCEANSIM	\
 	MOD_REMESH	\
-	MOD_SMOKE	\
-	NLS 		\
-	OPENAL 		\
-	OPENCOLORIO 	\
-	OPENEXR 	\
-	OPENIMAGEIO	\
+	NLS		\
+	OPENAL		\
+	OPENCOLORIO	\
+	OPENEXR		\
 	OPENIMAGEDN	\
 	OPENJPEG	\
-	OPENMP 		\
+	OPENMP		\
 	OPENPGL		\
 	OPENSUBDIV	\
 	OPENVDB		\
@ -46,13 +39,13 @@ OPTIONS_DEFINE=		\
 	PUGIXML		\
 	PULSEAUDIO	\
 	QUADRIFLOW	\
-	RAYOPTIMIZATION	\
 	SDL		\
 	SNDFILE		\
 	TBB		\
-	TIFF		\
 	THUMBNAILER	\
 	TRACE		\
+	USD		\
+	VULKAN		\
 	WAYLAND		\
 	WEBP		\
 	XINPUT		\
@ -60,35 +53,28 @@ OPTIONS_DEFINE=		\

 OPTIONS_DEFAULT=	\
 	ALEMBIC		\
-	ALEMBIC_HDF5	\
 	AVI		\
 	BULLET		\
 	CINEON		\
 	COLLADA		\
 	COMPOSITOR	\
 	CYCLES		\
-	DDS		\
 	DRACO		\
 	EBOOL		\
-	FFMPEG 		\
+	FFMPEG		\
 	FFTW3		\
-	FRAMESERVER	\
 	FREESTYLE	\
-	HDR		\
 	INPUT_NDOF	\
 	HARU		\
 	LZO		\
 	LZMA		\
 	MENU		\
-	MOD_BOOLEAN	\
 	MOD_FLUID	\
 	MOD_OCEANSIM	\
 	MOD_REMESH	\
-	MOD_SMOKE	\
 	OPENAL		\
 	OPENCOLORIO	\
 	OPENEXR		\
-	OPENIMAGEIO	\
 	OPENJPEG	\
 	OPENSUBDIV	\
 	OPENVDB		\
@ -96,10 +82,8 @@ OPTIONS_DEFAULT=	\
 	PUGIXML		\
 	PULSEAUDIO	\
 	QUADRIFLOW	\
-	RAYOPTIMIZATION	\
 	SDL		\
 	TBB		\
-	TIFF		\
 	THUMBNAILER	\
 	TRACE		\
 	WAYLAND		\
@ -107,55 +91,56 @@ OPTIONS_DEFAULT=	\
 	XINPUT		\
 	XF86VMODE

-OPTIONS_DEFAULT_amd64=	CAMERATRACK CYCLESEMBR OPENIMAGEDN OPENPGL
+# CAMERATRACK: libunwind only supports i386/amd64/aarch64/powerpc64/powerpc64le
+# CYCLES_EMBR: embree only supports amd64 and i386
+# OPENIMAGEDN: oidn only supports amd64
+# OPENPGL:     requires supported SIMD ISA - i386/amd64/aarch64/armv6/armv7
+OPTIONS_DEFAULT_aarch64=	CAMERATRACK OPENPGL
+OPTIONS_DEFAULT_amd64=		CAMERATRACK CYCLES_EMBR OPENIMAGEDN OPENPGL
+OPTIONS_DEFAULT_powerpc64=	CAMERATRACK
+OPTIONS_DEFAULT_powerpc64le=	CAMERATRACK

 ALEMBIC_DESC=		Enable Alembic file support
-ALEMBIC_HDF5_DESC=	Enable Alembic hdf5 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
+CAMERATRACK_DESC=	Camera tracking support (amd64/aarch64/powerpc64/powerpc64le only)
 COLLADA_DESC=		Enable read/write support for COLLADA files
 COMPOSITOR_DESC=	Use the tile-based nodal compositor
 CYCLES_DESC=		Cycles render engine support
-CYCLESEMBR_DESC=	Embree support (amd64 only)
-CYCLESOSL_DESC=		Shading support for the cycles render engine
-DDS_DESC=		DDS graphics format support
+CYCLES_EMBR_DESC=	Embree support (amd64 only)
+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
-FRAMESERVER_DESC=	Image FrameServer support for rendering
 FREESTYLE_DESC=		Enable advanced edges rendering
 HARU_DESC=		Enable libharu support
-HDR_DESC=		Generic high dynamic-range (HDR) support
 HEADLESS_DESC=		Disable user interface (for render-farms)
 INPUT_NDOF_DESC=	Enable NDOF input device support
 LZO_DESC=		Fast compression support
 LZMA_DESC=		Best compression support
 MENU_DESC=		Install desktop menu
-MOD_BOOLEAN_DESC=	Boolean modifier support
 MOD_FLUID_DESC=		Fluid simulation support
 MOD_OCEANSIM_DESC=	Ocean simulation support
 MOD_REMESH_DESC=	Remesh modifier support
-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
-OPENPGL_DESC=		Open Path Guiding in Cycles
+OPENIMAGEDN_DESC=	OpenImageDenoise support (amd64 only)
+OPENJPEG_DESC=		Enhanced JPEG (JPEG 2000) graphics support
+OPENPGL_DESC=		Open Path Guiding in Cycles (aarch64 and amd64 only)
 OPENSUBDIV_DESC=	Use the OpenSubDiv library for surface subdivision
 OPENVDB_DESC=		Use openVDB library for volumetric data
 OPENXR_DESC=		Enable VR features through the OpenXR specification
 POTRACE_DESC=		Enable features using libpotrace
 PUGIXML_DESC=		Enable pugixml support
 QUADRIFLOW_DESC=	Enable quadriflow remesher
-RAYOPTIMIZATION_DESC=	Enable SSE optimizatons for raytracing
 SDL_DESC=		Audio and Joystick support using SDL
 TBB_DESC=		Enable use of Intel's tbb
 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
-XINPUT_DESC=		X11 Xinput (tablet) support
 XF86VMODE_DESC=		X11 video mode switching support
+XINPUT_DESC=		X11 Xinput (tablet) support
--- a/graphics/blender/files/patch-CMakeLists.txt
+++ b/graphics/blender/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
--- CMakeLists.txt.orig	2023-02-21 16:36:49 UTC
+--- CMakeLists.txt.orig	2023-11-02 00:42:24 UTC
 +++ CMakeLists.txt
-@@ -859,11 +859,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID    
+@@ -1082,11 +1082,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES       
 set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
 set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)
 
--- a/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
+++ b/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
@ -1,6 +1,6 @@
--- intern/cycles/CMakeLists.txt.orig	2023-02-15 14:56:19 UTC
+--- intern/cycles/CMakeLists.txt.orig	2023-09-27 15:54:36 UTC
 +++ intern/cycles/CMakeLists.txt
-@@ -377,9 +377,9 @@ endif()
+@@ -398,9 +398,9 @@ if(WITH_CYCLES_DEBUG_NAN)
   add_definitions(-DWITH_CYCLES_DEBUG_NAN)
 endif()
 
--- a/graphics/blender/files/patch-intern_cycles_kernel_osl_CMakeLists.txt
+++ b/graphics/blender/files/patch-intern_cycles_kernel_osl_CMakeLists.txt
@ -1,6 +1,6 @@
--- intern/cycles/kernel/osl/CMakeLists.txt.orig	2022-12-30 03:23:58 UTC
+--- intern/cycles/kernel/osl/CMakeLists.txt.orig	2023-09-27 15:54:37 UTC
 +++ intern/cycles/kernel/osl/CMakeLists.txt
-@@ -31,6 +31,7 @@ set(LIB
+@@ -33,6 +33,7 @@ set(LIB
   ${OPENIMAGEIO_LIBRARIES}
   ${PUGIXML_LIBRARIES}
   ${CLANG_LIBRARIES}
--- a/graphics/blender/files/patch-intern_locale_boostlocalewrapper.cpp
+++ b/graphics/blender/files/patch-intern_locale_boostlocalewrapper.cpp
@ -1,17 +0,0 @@
-https://bugs.gentoo.org/887059
-
-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.orig	2023-02-15 14:56:19 UTC
-+++ intern/locale/boost_locale_wrapper.cpp
-@@ -10,6 +10,7 @@
- #include <stdio.h>
- 
- #include "boost_locale_wrapper.h"
-+#include <iostream>
- 
- static std::string messages_path;
- static std::string default_domain;
--- a/graphics/blender/files/patch-scripts_addons_ioscenegltf2_io_com_gltf2iodracocompressionextension.py
+++ b/graphics/blender/files/patch-scripts_addons_ioscenegltf2_io_com_gltf2iodracocompressionextension.py
@ -1,6 +1,6 @@
--- 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.orig	2023-09-27 15:58:27 UTC
 +++ scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-@@ -33,7 +33,7 @@ def dll_path() -> Path:
+@@ -34,7 +34,7 @@ def dll_path() -> Path:
         'win32': '{}.dll'.format(lib_name),
         'linux': 'lib{}.so'.format(lib_name),
         'darwin': 'lib{}.dylib'.format(lib_name)
--- a/graphics/blender/pkg-plist
+++ b/graphics/blender/pkg-plist
@ -506,123 +506,123 @@ share/applications/blender.desktop
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/osl.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/presets.py
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/properties.py
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/color2.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/color4.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/matrix33.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_absorption_volume.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_add_closure.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ambient_occlusion.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_attribute.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_background.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_bevel.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_blackbody.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_brick_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_brightness.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_bump.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_camera.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_checker_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_clamp.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_color.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_color_blend.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_color.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_hsv.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_rgb.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_xyz.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_color.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_float.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_int.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_normal.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_point.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_vector.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_diffuse_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_displacement.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_emission.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_environment_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_float_curve.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fractal_voronoi.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_gamma.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_geometry.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_glass_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_glossy_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_gradient_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hair_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hair_info.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hash.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_holdout.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hsv.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ies_light.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_image_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_invert.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_layer_weight.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_light_falloff.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_light_path.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_magic_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_map_range.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mapping.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_math.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_math.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_closure.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_color.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_float.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_vector.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_vector_non_uniform.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_musgrave_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_noise.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_noise_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_normal.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_normal_map.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_object_info.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_displacement.oso
-%%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
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ramp_util.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_refraction_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_curves.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_ramp.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_to_bw.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_scatter_volume.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_color.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_hsv.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_rgb.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_xyz.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_set_normal.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_sheen_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_sky_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_subsurface_scattering.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_tangent.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_texture_coordinate.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_toon_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_translucent_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_transparent_bsdf.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_uv_map.oso
-%%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
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vertex_color.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voronoi.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voronoi_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voxel_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wave_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wavelength.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_white_noise_texture.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wireframe.oso
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/oslutil.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/stdcycles.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/stdosl.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector2.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector4.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/color2.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/color4.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/matrix33.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_absorption_volume.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_add_closure.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ambient_occlusion.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_attribute.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_background.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_bevel.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_blackbody.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_brick_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_brightness.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_bump.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_camera.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_checker_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_clamp.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_color.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_color_blend.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_color.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_hsv.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_rgb.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_combine_xyz.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_color.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_float.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_int.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_normal.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_point.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_convert_from_vector.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_diffuse_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_displacement.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_emission.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_environment_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_float_curve.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fractal_voronoi.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_fresnel.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_gamma.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_geometry.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_glass_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_glossy_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_gradient_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hair_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hair_info.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hash.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_holdout.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_hsv.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ies_light.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_image_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_invert.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_layer_weight.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_light_falloff.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_light_path.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_magic_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_map_range.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mapping.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_math.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_math.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_closure.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_mix_color.oso
+%%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
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_normal_map.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_object_info.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_displacement.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_surface.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_output_volume.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_particle_info.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_point_info.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_hair_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_principled_volume.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_ramp_util.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_refraction_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_curves.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_ramp.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_rgb_to_bw.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_scatter_volume.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_color.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_hsv.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_rgb.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_separate_xyz.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_set_normal.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_sheen_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_sky_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_subsurface_scattering.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_tangent.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_texture_coordinate.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_toon_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_translucent_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_transparent_bsdf.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_uv_map.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_value.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_curves.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_displacement.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_map_range.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_math.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_rotate.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vector_transform.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_vertex_color.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voronoi.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voronoi_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_voxel_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wave_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wavelength.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_white_noise_texture.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/node_wireframe.oso
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/oslutil.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/stdcycles.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/stdosl.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector2.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/shader/vector4.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bake/bake.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh.h
 %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/local.h
@ -756,11 +756,11 @@ share/applications/blender.desktop
 %%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
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/closures_setup.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/closures_template.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/osl.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/services_gpu.h
-%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/types.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/closures_setup.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/closures_template.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/osl.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/services_gpu.h
+%%CYCLES_OSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/osl/types.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