Diff blender-3.4.1-r3 with a blender-3.5.1-r1

/usr/portage/media-gfx/blender/blender-3.5.1-r1.ebuild 2023-10-09 14:52:31.616368404 +0300
13 13
if [[ ${PV} = *9999* ]] ; then
14 14
	# Subversion is needed for downloading unit test files
15 15
	inherit git-r3 subversion
16
	EGIT_REPO_URI="https://git.blender.org/blender.git"
16
	EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"
17
	ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"
17 18
else
18 19
	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
19 20
	# Update these between major releases.
20 21
	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
21
	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
22
	# SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
22 23
	KEYWORDS="~amd64 ~arm ~arm64"
23 24
fi
24 25

  
25 26
SLOT="${PV%.*}"
26 27
LICENSE="|| ( GPL-3 BL )"
27
IUSE="+bullet +dds +fluid +openexr +tbb \
28
	alembic collada +color-management cuda +cycles \
29
	debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
30
	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
31
	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
32
	test +tiff valgrind wayland X"
28
IUSE="+bullet +dds +fluid +openexr +tbb
29
	alembic collada +color-management cuda +cycles cycles-bin-kernels
30
	debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k
31
	man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv
32
	+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl
33
	+sndfile test +tiff valgrind wayland X"
33 34
RESTRICT="!test? ( test )"
34 35

  
35 36
REQUIRED_USE="${PYTHON_REQUIRED_USE}
36 37
	alembic? ( openexr )
37 38
	cuda? ( cycles )
38
	cycles? ( openexr tiff openimageio )
39
	cycles? ( openexr tiff )
39 40
	fluid? ( tbb )
40 41
	openvdb? ( tbb )
41 42
	optix? ( cuda )
......
60 61
	media-libs/libjpeg-turbo:=
61 62
	media-libs/libpng:=
62 63
	media-libs/libsamplerate
64
	>=media-libs/openimageio-2.4.6.0:=
63 65
	sys-libs/zlib:=
64 66
	virtual/glu
65 67
	virtual/libintl
......
82 84
	nls? ( virtual/libiconv )
83 85
	openal? ( media-libs/openal )
84 86
	oidn? ( >=media-libs/oidn-1.4.1 )
85
	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
86 87
	openexr? (
87 88
		>=dev-libs/imath-3.1.4-r2:=
88 89
		>=media-libs/openexr-3:0=
89 90
	)
91
	openpgl? ( media-libs/openpgl )
90 92
	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
91 93
	openvdb? (
92 94
		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
......
138 140
	)
139 141
"
140 142

  
141
PATCHES=(
142
	"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
143
	"${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
144
)
145

  
146 143
blender_check_requirements() {
147 144
	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
148 145

  
......
175 172
src_unpack() {
176 173
	if [[ ${PV} = *9999* ]] ; then
177 174
		git-r3_src_unpack
175

  
176
		git-r3_fetch ${ADDONS_EGIT_REPO_URI}
177
		git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons
178

  
178 179
		if use test; then
179 180
			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
180 181
			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
181 182
		fi
183
		ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
184
		subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
182 185
	else
183 186
		default
184 187
		if use test; then
......
237 240
		-DWITH_CODEC_SNDFILE=$(usex sndfile)
238 241
		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
239 242
		-DWITH_CYCLES=$(usex cycles)
243
		-DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels)
240 244
		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
241 245
		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
242 246
		-DWITH_CYCLES_EMBREE=$(usex embree)
243 247
		-DWITH_CYCLES_OSL=$(usex osl)
244
		-DWITH_CYCLES_PATH_GUIDING=OFF
248
		-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
245 249
		-DWITH_CYCLES_STANDALONE=OFF
246 250
		-DWITH_CYCLES_STANDALONE_GUI=OFF
247 251
		-DWITH_DOC_MANPAGE=$(usex man)
......
273 277
		-DWITH_OPENCOLLADA=$(usex collada)
274 278
		-DWITH_OPENCOLORIO=$(usex color-management)
275 279
		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
276
		-DWITH_OPENIMAGEIO=$(usex openimageio)
277 280
		-DWITH_OPENMP=$(usex openmp)
278 281
		-DWITH_OPENSUBDIV=$(usex opensubdiv)
279 282
		-DWITH_OPENVDB=$(usex openvdb)
Thank you!