mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
media-gfx/blender: Respect the users march flags and fix deps
Up until a recent upstream change, Blender would append march flags that would overwrite the ones set by the user. Now they have an option to disable this behaviour. Blender now requires Openimageio to have it's python module built. At least one shipped plugin depends on this now. Signed-off-by: Sebastian Parborg <sebastian@blender.org> Part-of: https://github.com/gentoo/gentoo/pull/45047 Closes: https://github.com/gentoo/gentoo/pull/45047 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
4106256927
commit
a58fbad5e4
@ -119,7 +119,7 @@ RDEPEND="${PYTHON_DEPS}
|
||||
media-libs/libjpeg-turbo:=
|
||||
>=media-libs/libpng-1.6.50:=
|
||||
media-libs/libsamplerate
|
||||
>=media-libs/openimageio-3.0.9.1:=
|
||||
>=media-libs/openimageio-3.0.9.1:=[python,${PYTHON_SINGLE_USEDEP}]
|
||||
virtual/glu
|
||||
virtual/libintl
|
||||
virtual/opengl[X?]
|
||||
@ -213,7 +213,7 @@ DEPEND="${RDEPEND}
|
||||
dev-cpp/eigen:=
|
||||
test? (
|
||||
$(python_gen_cond_dep '
|
||||
media-libs/openimageio[jpeg2k,python,${PYTHON_SINGLE_USEDEP},tools]
|
||||
media-libs/openimageio[jpeg2k,tools]
|
||||
')
|
||||
)
|
||||
"
|
||||
@ -465,6 +465,7 @@ src_configure() {
|
||||
|
||||
# Compiler Options:
|
||||
# -DWITH_BUILDINFO="yes"
|
||||
-DWITH_COMPILER_SIMD="no" # This makes it so Blender doesn't append their own -march flags
|
||||
|
||||
# System Options:
|
||||
-DWITH_INSTALL_PORTABLE="no"
|
||||
@ -744,14 +745,6 @@ src_test() {
|
||||
"^script_pyapi_bpy_driver_secure_eval$"
|
||||
)
|
||||
|
||||
if [[ "${RUN_FAILING_TESTS:-0}" -eq 0 ]]; then
|
||||
einfo "not running failing tests RUN_FAILING_TESTS=${RUN_FAILING_TESTS}"
|
||||
CMAKE_SKIP_TESTS+=(
|
||||
# Does try to import from weird paths
|
||||
"^io_fbx_import$"
|
||||
)
|
||||
fi
|
||||
|
||||
if ! has_version "media-libs/openusd"; then
|
||||
CMAKE_SKIP_TESTS+=(
|
||||
# from pxr import Usd # ModuleNotFoundError: No module named 'pxr'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user