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=9c7d40724a...
https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=13c92f2302....
Change:
+ExclusiveArch: x86_64 aarch64 ppc64le s390x
+%ifarch x86_64 || aarch64
Thanks.
Full change:
============
commit 9834ba0dfbf8948c9ed9ccc859aa2ea8a43cff5b
Merge: b85cc25 8cef9b7
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Nov 27 13:06:26 2021 -0800
Update to 2.93.6
diff --cc blender.spec
index d60f447,d4c8b34..60e0ed9
--- a/blender.spec
+++ b/blender.spec
@@@ -33,10 -33,10 +33,11 @@@
Name: blender
Epoch: 1
- Version: 2.93.5
- Release: 1%{?dist}
+ Version: 2.93.6
+ Release: %autorelease
+
+
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
URL:
http://www.blender.org
commit 8cef9b74cc1de01a364648a712aab7cda8873dba
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Nov 27 12:00:49 2021 -0800
Update to 2.93.6 with enabled NanoVDB support
diff --git a/blender.spec b/blender.spec
index 310ce2c..d4c8b34 100644
--- a/blender.spec
+++ b/blender.spec
@@ -33,7 +33,7 @@
Name: blender
Epoch: 1
-Version: 2.93.5
+Version: 2.93.6
Release: %autorelease
@@ -135,6 +135,7 @@ BuildRequires: pkgconfig(freeglut)
%endif
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
+BuildRequires: openxr-libs
BuildRequires: pkgconfig(openxr)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrender)
@@ -277,7 +278,6 @@ sed -i "s/date_time/date_time
python%{python3_version_nodots}/" \
-DWITH_GL_EGL=ON \
%endif
-DWITH_INSTALL_PORTABLE=OFF \
- -DWITH_NANOVDB=OFF \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
%if %{with sdl}
@@ -290,8 +290,9 @@ sed -i "s/date_time/date_time
python%{python3_version_nodots}/" \
%if %{with usd}
-DWITH_USD=ON \
%else
- -DWITH_USD=OFF
+ -DWITH_USD=OFF \
%endif
+ -DXR_OPENXR_SDK_LOADER_LIBRARY=%{_libdir}/libopenxr_loader.so.1
%cmake_build
diff --git a/blender.thumbnailer b/blender.thumbnailer
deleted file mode 100644
index 3de5dd5..0000000
--- a/blender.thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=blender-thumbnailer.py
-Exec=blender-thumbnailer.py %i %o
-MimeType=application/x-blender;
diff --git a/changelog b/changelog
deleted file mode 100644
index d36e208..0000000
--- a/changelog
+++ /dev/null
@@ -1,138 +0,0 @@
-* Sat Jul 31 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.1-1
-- Update to 2.93.1
-- Drop downstream thumbmailer
-- Uses autorelease and autochangelog macros
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> 1:2.93.0-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> 1:2.93.0-8
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-7
-- Disable usd support due to broken dependencies
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-6
-- Disable usd support due to broken dependencies
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-5
-- Rebuild for openxr 1.0.17
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-4
-- Rebuild for openxr 1.0.17
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-3
-- Rebuild for openxr 1.0.17
-
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> 1:2.93.0-2
-- Rebuilt for Python 3.10
-
-* Fri Jun 04 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.93.0-1
-- Update to 2.93.0 (#1967342)
-
-* Fri May 21 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-13
-- Rebuild for opensubdib 3.4.4
-
-* Wed May 19 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-12
-- Rebuild for opensubdib 3.4.4
-
-* Wed May 19 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-11
-- Rebuild for alembic 1.8.1 and oidn 1.4.0
-
-* Wed May 12 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-10
-- Rebuild for openxr 1.10.6
-
-* Tue May 11 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-9
-- Rebuild for embree 3.13.0
-
-* Tue Apr 27 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-8
-- Enable cycles rendering support for non x86_64 arch
-
-* Mon Apr 19 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-7
-- BuildRequire setuptools explicitly (
https://pagure.io/fesco/issue/2590)
-
-* Mon Apr 19 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-6
-- Rebuild for openxr 1.0.15
-
-* Mon Apr 19 2021 Tomas Hrnciar <thrnciar(a)redhat.com> 1:2.92.0-5
-- BuildRequire setuptools explicitly
-
-* Thu Apr 08 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-4
-- Rebuild for alembic 1.8.0_beta2
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely(a)redhat.com> 1:2.92.0-3
-- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Fri Feb 26 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-2
-- Update to 2.92.0 (#1932861)
-
-* Fri Feb 26 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.92.0-1
-- Update to 2.92.0 (#1932861)
-
-* Sun Feb 07 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.2-5
-- Rebuild for oidn 1.3.0
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> 1:2.91.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 24 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.2-3
-- Rebuild for opensubdiv with enabled ptex
-
-* Thu Jan 21 2021 Mamoru TASAKA <mtasaka(a)fedoraproject.org> 1:2.91.2-2
-- fix email mistake...
-
-* Thu Jan 21 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.2-1
-- Update to 2.91.2 (#1918303)
-
-* Tue Jan 19 2021 Mamoru TASAKA <mtasaka(a)fedoraproject.org> 1:2.91.0-10
-- Backport eigen3 log1p fix for now
-
-* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> 1:2.91.0-9
-- Switch to git-core
-
-* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> 1:2.91.0-8
-- Update changelog
-
-* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> 1:2.91.0-7
-- Drop old blender font patch - ref rhbz#1889049
-
-* Mon Jan 18 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.0-6
-- Obsolete subpackage blender-fonts(#1917244)
-
-* Sat Jan 16 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.0-5
-- Rebuild for OpenEXR 2.5.4
-
-* Mon Jan 04 2021 Miro Hrončok <miro(a)hroncok.cz> 1:2.91.0-4
-- Rebuild for new libopenvdb
-
-* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> 1:2.91.0-3
-- Rebuild for OpenEXR 2.5.3.
-
-* Sat Nov 28 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.0-2
-- Rebuild for embree 3.12.1
-
-* Thu Nov 26 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.91.0-1
-- Update to 2.91.0 (#1901446)
-
-* Sat Oct 31 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.1-3
-- Add hdapi, lame and vpx (webm) dependencies
-
-* Thu Sep 24 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.1-2
-- Add missing patches
-
-* Thu Sep 24 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.1-1
-- Update to 2.90.1 (#1881831)
-
-* Mon Sep 14 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.0-9
-- Rebuild for oidn 1.2.3
-
-* Thu Sep 10 2020 Dan Horák <dan(a)danny.cz> 1:2.90.0-8
-- update comment about s390x being excluded
-
-* Sat Sep 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.0-7
-- Build exclusively on 64-bits architectures due to upstream change
-
-* Sat Sep 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> 1:2.90.0-6
-- Merge branch 'master' of
ssh://pkgs.fedoraproject.org/rpms/blender into
- master
-
diff --git a/sources b/sources
index 278e49e..9af8501 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.93.5.tar.xz) =
274e94fa64af0a414815d2809870982dc1093732ddad9e91318f96ce5b72102d9afab16273724127568c0e890dad921bd8f72d7b0e74c9c501b3e86f6b7cfaa0
+SHA512 (blender-2.93.6.tar.xz) =
0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea
commit 9c7d40724af51c5068b0d8e718ecf06a3d12dc9f
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sat Nov 27 23:30:13 2021 +0900
Fix s390x LTO issue on makesrna: force alignment on DNAstr definition in makesdna.c
(upstream T93425) (bug 1874398)
diff --git
a/blender-2.93.5-0001-Fix-T93425-makesdna-force-DNAstr-to-be-4-bytes-align.patch
b/blender-2.93.5-0001-Fix-T93425-makesdna-force-DNAstr-to-be-4-bytes-align.patch
new file mode 100644
index 0000000..7f8a539
--- /dev/null
+++ b/blender-2.93.5-0001-Fix-T93425-makesdna-force-DNAstr-to-be-4-bytes-align.patch
@@ -0,0 +1,35 @@
+From aa31976394c6439b5baa823e578f5122a9cf3685 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
+Date: Sat, 27 Nov 2021 23:22:55 +0900
+Subject: [PATCH] Fix T93425: makesdna: force DNAstr to be 4 bytes aligned.
+
+init_structDNA() in dna_gen.c expects that the input sdna->data is 4-bytes aligned.
+DNAstr[] buffer written by makesdna is used for this data, so make DNAstr forcely
+4-bytes aligned.
+---
+ source/blender/makesdna/intern/makesdna.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/source/blender/makesdna/intern/makesdna.c
b/source/blender/makesdna/intern/makesdna.c
+index 114c0b4..d709582 100644
+--- a/source/blender/makesdna/intern/makesdna.c
++++ b/source/blender/makesdna/intern/makesdna.c
+@@ -1555,8 +1555,14 @@ int main(int argc, char **argv)
+ base_directory = BASE_HEADER;
+ }
+
++#ifdef __GNUC__
++#define FORCE_ALIGN_4 " __attribute__((aligned(4))) "
++#else
++#define FORCE_ALIGN_4 " "
++#endif
++
+ fprintf(file_dna, "extern const unsigned char DNAstr[];\n");
+- fprintf(file_dna, "const unsigned char DNAstr[] = {\n");
++ fprintf(file_dna, "const unsigned char " FORCE_ALIGN_4 "DNAstr[] =
{\n");
+ if (make_structDNA(base_directory, file_dna, file_dna_offsets, file_dna_verify))
{
+ /* error */
+ fclose(file_dna);
+--
+2.33.1
+
diff --git a/blender.spec b/blender.spec
index 82808c7..310ce2c 100644
--- a/blender.spec
+++ b/blender.spec
@@ -58,6 +58,9 @@ Patch2: %{name}-usd-writer-abstract-fix.diff
# Patch for build with OIIO 2.3+
Patch3: blender-oiio-2.3.patch
+#
https://developer.blender.org/T93425
+# Force makesdna: force DNAstr to be 4 bytes aligned : fixes s390x LTO issue
+Patch4:
blender-2.93.5-0001-Fix-T93425-makesdna-force-DNAstr-to-be-4-bytes-align.patch
# Development stuff
BuildRequires: boost-devel
@@ -203,8 +206,7 @@ Provides: blenderplayer = 1:2.80-1
Obsoletes: blender-fonts < 1:2.91.0-5
# Starting from 2.90, Blender support only 64-bits architectures
-ExclusiveArch: x86_64 aarch64 ppc64le
-# s390x is excluded due
https://bugzilla.redhat.com/show_bug.cgi?id=1874398
+ExclusiveArch: x86_64 aarch64 ppc64le s390x
%description
Blender is the essential software solution you need for 3D, from modeling,
commit 13c92f230248e12adb67d0c54e530271e12531cb
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Oct 6 23:26:24 2021 -0700
Update to 2.93.5 (#2011379)
diff --git a/blender.spec b/blender.spec
index 366badf..82808c7 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: %autorelease
@@ -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 1e4479d575c7991d3892d6b84e77a183093cd1a2
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 467732b..366badf 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 7a10a1d673d7d30d3bbfa2abb4b4842a23d11811
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Oct 4 22:05:15 2021 -0500
Rebuild for OpenImageIO 2.3.8.0.
commit 0171b9aa4dddeac2d0d299b2857550466c82c5bd
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 be3234cd65a6ca771f5132579fbca2f0aa7aaed8
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sun Sep 12 01:51:45 2021 -0700
Rebuild for alembic 1.8.3