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=2baeb40549....
Change:
+%ifarch x86_64 || aarch64
Thanks.
Full change:
============
commit 729a8091732057234988f4cf17d1fa3fb8d7b140
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Fri Oct 8 08:24:29 2021 -0700
Update to 2.93.5
diff --git a/blender.spec b/blender.spec
index 2a54cf3..08ed899 100644
--- a/blender.spec
+++ b/blender.spec
@@ -337,7 +337,3 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%changelog
%autochangelog
-<<<<<<< HEAD
-
-=======
->>>>>>> 629feeaded35d614826bbefb67f2e1624268819a
commit 65bc56cef31ba40c8f6b7ac62cc01bdb517540e1
Merge: c4652d8 b85cc25
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Fri Oct 8 08:23:07 2021 -0700
Update to 2.93.5
diff --cc blender.spec
index 5202dfc,d60f447..2a54cf3
--- a/blender.spec
+++ b/blender.spec
@@@ -29,9 -33,10 +33,9 @@@
Name: blender
Epoch: 1
- Version: 2.93.4
+ Version: 2.93.5
Release: 1%{?dist}
-
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
URL:
http://www.blender.org
commit b85cc256e8684b7638a29c5e5c289ca2c9af22f7
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Fri Oct 8 01:43:59 2021 -0700
Disable usd for Fedora 34
diff --git a/blender.spec b/blender.spec
index 9922e9a..d60f447 100644
--- a/blender.spec
+++ b/blender.spec
@@ -137,7 +137,7 @@ BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(ode)
BuildRequires: pkgconfig(sdl2)
-%if %{with usd}
+%if %{with usd} && 0%{?fedora} != 34
BuildRequires: usd-devel
%endif
BuildRequires: pkgconfig(xproto)
commit 4c9096216be51d4e97f3061503f75bbbbe5d2653
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Oct 4 22:05:15 2021 -0500
Rebuild for OpenImageIO 2.3.8.0.
commit 9e5f899dffae8b2c457a201ccc930e64a52c84f8
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Wed Sep 29 18:02:49 2021 +0200
Rebuild again for alembic 1.8.3
commit f27446827fe7ab1d4f6dd418b80a871d4cb87ad7
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sun Sep 12 01:51:45 2021 -0700
Rebuild for alembic 1.8.3
commit 2baeb40549d9540a4f97120c29c14a56eaffa1de
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Oct 7 18:44:39 2021 -0700
Update to 2.93.5 (#2011379)
diff --git a/blender.spec b/blender.spec
index 650a9e1..9922e9a 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,18 +5,22 @@
%bcond_with ffmpeg
# Needed to enable osl support for cycles rendering
%bcond_without llvm
-%bcond_with openshading
+%bcond_without openshading
+%bcond_with sdl
%bcond_without system_eigen3
%bcond_with wayland
%ifarch x86_64 || aarch64 || ppc64le
%global cyclesflag ON
+# Availabel for x86_64 and aarch64
+%ifarch x86_64 || aarch64
+%bcond_without usd
+%endif
# Only available on x86_64
%ifarch x86_64
%bcond_without embree
%bcond_without hidapi
%bcond_without oidn
-%bcond_without usd
%else
%bcond_with embree
%bcond_with hidapi
@@ -29,7 +33,7 @@
Name: blender
Epoch: 1
-Version: 2.93.4
+Version: 2.93.5
Release: 1%{?dist}
@@ -274,6 +278,9 @@ sed -i "s/date_time/date_time
python%{python3_version_nodots}/" \
-DWITH_NANOVDB=OFF \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
+%if %{with sdl}
+ -DWITH_GHOST_SDL=ON \
+%endif
%if %{with system_eigen3}
-DWITH_SYSTEM_EIGEN3=ON \
%endif
diff --git a/sources b/sources
index cb3ca13..278e49e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.93.4.tar.xz) =
8873a8d47da1cd5cdfad9c6311b2b4b9588e101c4ed2f2e231eb26efa88a5f3fa30fba49e1e320fe920d14b15a990c030e6764defd64e6226b42a47db7feaae8
+SHA512 (blender-2.93.5.tar.xz) =
274e94fa64af0a414815d2809870982dc1093732ddad9e91318f96ce5b72102d9afab16273724127568c0e890dad921bd8f72d7b0e74c9c501b3e86f6b7cfaa0
commit f1637952a74b6f8799b9b5676fc4dfbc273686ec
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Oct 5 22:26:56 2021 -0500
Add patch for OIIO 2.3+.
diff --git a/blender-oiio-2.3.patch b/blender-oiio-2.3.patch
new file mode 100644
index 0000000..87175b7
--- /dev/null
+++ b/blender-oiio-2.3.patch
@@ -0,0 +1,29 @@
+Index: blender-2.93.4/build_files/cmake/Modules/FindOpenImageIO.cmake
+===================================================================
+--- blender-2.93.4.orig/build_files/cmake/Modules/FindOpenImageIO.cmake
++++ blender-2.93.4/build_files/cmake/Modules/FindOpenImageIO.cmake
+@@ -48,6 +48,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
+ lib64 lib
+ )
+
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
++ NAMES
++ OpenImageIO_Util
++ HINTS
++ ${_openimageio_SEARCH_DIRS}
++ PATH_SUFFIXES
++ lib64 lib
++ )
++
+ FIND_FILE(OPENIMAGEIO_IDIFF
+ NAMES
+ idiff
+@@ -64,7 +73,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenIm
+ OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
+
+ IF(OPENIMAGEIO_FOUND)
+- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++ SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+ SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+ IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
+ SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
diff --git a/blender.spec b/blender.spec
index 3d86abd..650a9e1 100644
--- a/blender.spec
+++ b/blender.spec
@@ -52,6 +52,9 @@ Patch1: %{name}-usd-pythonlibs-fix.diff
#
https://developer.blender.org/T90842
Patch2: %{name}-usd-writer-abstract-fix.diff
+# Patch for build with OIIO 2.3+
+Patch3: blender-oiio-2.3.patch
+
# Development stuff
BuildRequires: boost-devel
%if %{with clang}
commit 52170cb90b915ef350e2ee23477410faff764d01
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Oct 4 22:05:15 2021 -0500
Rebuild for OpenImageIO 2.3.8.0.
commit fe96fec42902a807b3fda512c27cb26db09fb856
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Wed Sep 29 18:02:49 2021 +0200
Rebuild again for alembic 1.8.3
commit bd4486fc27c93adf38b60cba98d60df61ae5c6aa
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sun Sep 12 01:51:45 2021 -0700
Rebuild for alembic 1.8.3