The package rpms/blender.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=c924931e34....
Change:
+%ifnarch x86_64
Thanks.
Full change:
============
commit c924931e34d98255d0b04fd64aeac6832dc4d650
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Mon Apr 26 18:27:43 2021 -0700
Enable cycles rendering support for non x86_64 arch
Explicitly disable embree support on cycle rendering for non x86_64 arch
diff --git a/blender.spec b/blender.spec
index ef66244..bf20f49 100644
--- a/blender.spec
+++ b/blender.spec
@@ -4,29 +4,35 @@
%global blender_api 2.92
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo
$d)
-%bcond_with ffmpeg
-%bcond_with openshading
-%bcond_with wayland
+
+%bcond_with ffmpeg
+%bcond_with openshading
+%bcond_without system_eigen3
+%bcond_with wayland
# Only available on x86_64
%ifarch x86_64
-%bcond_without embree
-%bcond_without hidapi
-%bcond_without oidn
-%bcond_without usd
+%bcond_without embree
+%bcond_without hidapi
+%bcond_without oidn
+%bcond_without usd
+%else
+%bcond_with embree
+%bcond_with hidapi
+%bcond_with oidn
+%bcond_with usd
+%endif
+
+%ifarch x86_64 || aarch64 || ppc64le
%global cyclesflag ON
%else
-%bcond_with embree
-%bcond_with hidapi
-%bcond_with oidn
-%bcond_with usd
%global cyclesflag OFF
%endif
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -40,7 +46,7 @@ Source3: macros.%{name}
# Extracted from
#
https://gitlab.com/libeigen/eigen/-/commit/d55d392e7b1136655b4223bea8e99c...
-Patch0: blender-2.91-eigen3-log1p-ifelse.patch
+# Patch0: blender-2.91-eigen3-log1p-ifelse.patch
# Development stuff
BuildRequires: boost-devel
@@ -54,6 +60,9 @@ BuildRequires: libtool
BuildRequires: libspnav-devel
BuildRequires: llvm-devel
BuildRequires: pkgconfig(blosc)
+%if %{with system_eigen3}
+BuildRequires: pkgconfig(eigen3)
+%endif
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gmp)
%if %{with hidapi}
@@ -200,7 +209,6 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
# Fix all Python shebangs recursively in .
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-
%build
%cmake \
%ifnarch x86_64
@@ -232,11 +240,13 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-DPYTHON_VERSION=%{python3_version} \
-DWITH_ALEMBIC=ON \
-DWITH_CYCLES=%{cyclesflag} \
- -DWITH_CYCLES_EMBREE=%{cyclesflag} \
+%ifnarch x86_64
+ -DWITH_CYCLES_EMBREE=OFF \
+%endif
-DWITH_DOC_MANPAGE=ON \
%if %{with wayland}
-DWITH_GHOST_WAYLAND=ON \
- -DWITH_GL_EGL=ON \
+ -DWITH_XR_OPENXR=OFF \
%endif
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_LLVM=ON \
@@ -245,6 +255,9 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-DWITH_OPENVDB_BLOSC=ON \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
+%if %{with system_eigen3}
+ -DWITH_SYSTEM_EIGEN3=ON \
+%endif
-DWITH_SYSTEM_GLEW=ON \
%if %{with usd}
-DWITH_USD=OFF
@@ -277,7 +290,7 @@ install -p -m 644 -D
release/freedesktop/org.%{name}.Blender.appdata.xml \
# rpmlint fixes
find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name "*.py" -exec
chmod 755 {} \;
-#find %%{buildroot}%%{_datadir}/%%{name}/scripts -type f -exec sed -i -e
's/\r$//g' {} \;
+
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -302,6 +315,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Fri Apr 23 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-6
+- Enable cycles rendering support for non x86_64 arch
+- Explicitly disable embree support on cycle rendering for non x86_64 arch
+
* Mon Apr 19 2021 Tomas Hrnciar <thrnciar(a)redhat.com> - 1:2.92.0-5
- BuildRequire setuptools explicitly (
https://pagure.io/fesco/issue/2590)