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=6b7d8960c3....
Change:
-%ifnarch %{ix86} armv7hl
Thanks.
Full change:
============
commit 6b7d8960c3f99794d01a70ee2e95c58141043613
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Aug 25 09:40:02 2020 +0200
Merge 2.83.5 from master
diff --git a/.gitignore b/.gitignore
index 0cc9b7f..84dbb18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/results_*/
/$package_name-*/
/blender-2.49b-repack.tar.bz2
/blender-2.56-beta.tar.gz
@@ -58,3 +57,5 @@
/blender-2.83.1.tar.xz
/blender-2.83.2.tar.xz
/blender-2.83.3.tar.xz
+/blender-2.83.4.tar.xz
+/blender-2.83.5.tar.xz
diff --git a/blender-support-python-3.9.diff b/blender-support-python-3.9.diff
index a2a34ca..9f23e3c 100644
--- a/blender-support-python-3.9.diff
+++ b/blender-support-python-3.9.diff
@@ -1,6 +1,6 @@
-diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
blender-2.83.2/source/blender/python/mathutils/mathutils_Matrix.c
---- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c 2020-07-08
22:46:25.000000000 -0700
-+++ blender-2.83.2/source/blender/python/mathutils/mathutils_Matrix.c 2020-07-10
23:06:20.171478183 -0700
+diff -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Matrix.c
blender-2.83.5/source/blender/python/mathutils/mathutils_Matrix.c
+--- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Matrix.c 2020-08-20
16:59:43.253094831 +0200
++++ blender-2.83.5/source/blender/python/mathutils/mathutils_Matrix.c 2020-08-20
20:46:01.903876602 +0200
@@ -42,7 +42,8 @@
static PyObject *Matrix_copy(MatrixObject *self);
static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args);
@@ -11,7 +11,13 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
static PyObject *MatrixAccess_CreatePyObject(MatrixObject *matrix, const eMatrixAccess_t
type);
static int matrix_row_vector_check(MatrixObject *mat, VectorObject *vec, int row)
-@@ -399,10 +400,10 @@
+@@ -395,14 +396,15 @@
+ return NULL;
+ }
+
+-static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject
*self)
++static PyObject *matrix__apply_to_copy(PyObject *(*matrix_func)(MatrixObject *),
++ MatrixObject *self)
{
PyObject *ret = Matrix_copy(self);
if (ret) {
@@ -24,7 +30,7 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
}
else { /* error */
Py_DECREF(ret);
-@@ -1737,7 +1738,7 @@
+@@ -1737,7 +1739,7 @@
" .. note:: When the matrix cant be adjugated a :exc:`ValueError` exception
is raised.\n");
static PyObject *Matrix_adjugated(MatrixObject *self)
{
@@ -33,7 +39,7 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
}
PyDoc_STRVAR(
-@@ -1945,7 +1946,7 @@
+@@ -1945,7 +1947,7 @@
" :rtype: :class:`Matrix`\n");
static PyObject *Matrix_transposed(MatrixObject *self)
{
@@ -42,7 +48,7 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
}
/*---------------------------matrix.normalize() ------------------*/
-@@ -1991,7 +1992,7 @@
+@@ -1991,7 +1993,7 @@
" :rtype: :class:`Matrix`\n");
static PyObject *Matrix_normalized(MatrixObject *self)
{
@@ -51,9 +57,9 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c
}
/*---------------------------matrix.zero() -----------------------*/
-diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternion.c
blender-2.83.2/source/blender/python/mathutils/mathutils_Quaternion.c
---- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternion.c 2020-07-08
22:46:25.000000000 -0700
-+++ blender-2.83.2/source/blender/python/mathutils/mathutils_Quaternion.c 2020-07-10
23:11:47.121258500 -0700
+diff -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Quaternion.c
blender-2.83.5/source/blender/python/mathutils/mathutils_Quaternion.c
+--- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Quaternion.c 2020-08-20
16:59:43.253094831 +0200
++++ blender-2.83.5/source/blender/python/mathutils/mathutils_Quaternion.c 2020-08-20
20:47:51.201624646 +0200
@@ -34,7 +34,8 @@
#define QUAT_SIZE 4
@@ -91,12 +97,11 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternio
}
PyDoc_STRVAR(Quaternion_copy_doc,
-@@ -1385,10 +1386,12 @@
+@@ -1385,10 +1386,11 @@
return Quaternion_CreatePyObject(quat, type);
}
-static PyObject *quat__apply_to_copy(PyNoArgsFunction quat_func, QuaternionObject
*self)
-+
+static PyObject *quat__apply_to_copy(PyObject *(*quat_func)(QuaternionObject *),
+ QuaternionObject *self)
{
@@ -106,9 +111,9 @@ diff -ru
blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternio
if (ret_dummy) {
Py_DECREF(ret_dummy);
return ret;
-diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Vector.c
blender-2.83.2/source/blender/python/mathutils/mathutils_Vector.c
---- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Vector.c 2020-07-08
22:46:25.000000000 -0700
-+++ blender-2.83.2/source/blender/python/mathutils/mathutils_Vector.c 2020-07-10
23:13:22.243694056 -0700
+diff -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Vector.c
blender-2.83.5/source/blender/python/mathutils/mathutils_Vector.c
+--- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Vector.c 2020-08-20
16:59:43.253094831 +0200
++++ blender-2.83.5/source/blender/python/mathutils/mathutils_Vector.c 2020-08-20
20:48:51.530589513 +0200
@@ -96,10 +96,10 @@
return Vector_CreatePyObject_alloc(vec, size, type);
}
diff --git a/blender.spec b/blender.spec
index fae4663..bc47d72 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,3 +1,6 @@
+# Force out of source build
+%undefine __cmake_in_source_build
+
%global blender_api 2.83
# Turn off the brp-python-bytecompile script
@@ -11,14 +14,21 @@
%global cyclesflag OFF
%endif
-# Comment this to enable FFmpeg support.
-%global _without_ffmpeg 1
+%bcond_with ffmpeg
+%bcond_with openshading
+%bcond_with embree
+
+# Only available on x86_64
+%ifarch x86_64
+%bcond_without oidn
+%else
+%bcond_with oidn
+%endif
Name: blender
Epoch: 1
-Version: %{blender_api}.3
-Release: 1%{?dist}
-
+Version: %{blender_api}.5
+Release: 2%{?dist}
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
@@ -35,39 +45,40 @@ Patch0: %{name}-%{blender_api}-droid.patch
# Upstream fix to support Python 3.9
#
https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f
-#%%if 0%%{?fedora} > 32
-#Patch1: %%{name}-support-python-3.9.diff
-#%%endif
+%if 0%{?fedora} >= 33
+Patch1: %{name}-support-python-3.9.diff
+%endif
# Development stuff
BuildRequires: boost-devel
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: git
BuildRequires: libtool
BuildRequires: libspnav-devel
+BuildRequires: llvm-devel
BuildRequires: pkgconfig(blosc)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(jemalloc)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(openssl)
-%if 0%{?fedora} > 31
+%if 0%{?fedora} >= 32
BuildRequires: pkgconfig(pugixml)
%else
BuildRequires: pugixml-devel
%endif
BuildRequires: pkgconfig(python3) >= 3.5
BuildRequires: pkgconfig(xxf86vm)
-BuildRequires: python3-numpy
-BuildRequires: python3-requests
+BuildRequires: python3dist(numpy)
+BuildRequires: python3dist(requests)
BuildRequires: subversion-devel
# Compression stuff
BuildRequires: pkgconfig(liblzma)
-%if 0%{?fedora} > 31
+%if 0%{?fedora} >= 32
BuildRequires: pkgconfig(lzo2)
%else
BuildRequires: lzo-devel
@@ -76,9 +87,15 @@ BuildRequires: pkgconfig(zlib)
# 3D modeling stuff
-%ifarch x86_64
-BuildRequires: embree-devel
-BuildRequires: oidn-devel
+%if %{with embree}
+BuildRequires: cmake(embree)
+%endif
+BuildRequires: opensubdiv-devel
+%if %{with openshading}
+BuildRequires: cmake(OSL)
+%endif
+%if %{with oidn}
+BuildRequires: cmake(OpenImageDenoise)
%endif
BuildRequires: openCOLLADA-devel >= svn825
BuildRequires: pkgconfig(fftw3)
@@ -95,19 +112,14 @@ BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(ode)
-#Exclude architectures where build fails
-%ifnarch %{ix86} armv7hl
-BuildRequires: pkgconfig(oslcomp)
-%endif
-BuildRequires: opensubdiv-devel
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(xproto)
# Picture/Video stuff
-BuildRequires: alembic-devel
-%{!?_without_ffmpeg:
+BuildRequires: cmake(Alembic)
+%if %{with ffmpeg}
BuildRequires: ffmpeg-devel
-}
+%endif
BuildRequires: openvdb-devel
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
@@ -121,14 +133,14 @@ BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(tbb)
# Audio stuff
+BuildRequires: pkgconfig(ao)
BuildRequires: pkgconfig(freealut)
BuildRequires: pkgconfig(jack)
-BuildRequires: pkgconfig(ao)
BuildRequires: pkgconfig(ogg)
+BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(vorbis)
-BuildRequires: pkgconfig(opus)
# Typography stuff
BuildRequires: fontpackages-devel
@@ -141,8 +153,8 @@ Requires: google-droid-sans-fonts
Requires: hicolor-icon-theme
Requires: %{name}-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: fontpackages-filesystem
-Requires: python3-numpy
-Requires: python3-requests
+Requires: python3dist(requests)
+Requires: python3dist(numpy)
Provides: blender(ABI) = %{blender_api}
# Obsolete the standalone Blender player retired by upstream
@@ -152,7 +164,7 @@ Provides: blenderplayer = 1:2.80-1
# Temporarily exclude ARM32 architecture due to build failure
#
https://koji.fedoraproject.org/koji/taskinfo?taskID=45594704
#
https://bugzilla.redhat.com/show_bug.cgi?id=1843100
-# ExcludeArch: armv7hl
+# ExcludeArch: armv7hl
%description
Blender is the essential software solution you need for 3D, from modeling,
@@ -192,37 +204,52 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
%build
-
-%cmake \
- -B build
+%cmake . \
%ifnarch %{ix86} x86_64
-DWITH_RAYOPTIMIZATION=OFF \
+%endif
+%if %{with ffmpeg}
+ -DWITH_CODEC_FFMPEG=ON \
+%else
+ -DWITH_CODEC_FFMPEG=OFF \
+%endif
+%if %{with embree}
+ -D_embree_LIBRARIES=%{_libdir} \
+ -DWITH_CYCLES_EMBREE=%{cyclesflag} \
+%endif
+%if %{with openshading}
+ -DOSL_COMPILER=g++ \
+%endif
+%if %{with oidn}
+ -DOPENIMAGEDENOISE_LIBRARY=%{_libdir} \
+ -DOPENIMAGEDENOISE_INCLUDE_DIR=%{_includedir} \
+ -DWITH_OPENIMAGEDENOISE=ON \
%endif
-DBOOST_ROOT=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_C_FLAGS="%{optflags} -Wl,--as-needed" \
+ -DCMAKE_CXX_FLAGS="%{optflags} -Wl,--as-needed" \
-DCMAKE_SKIP_RPATH=ON \
-DOpenGL_GL_PREFERENCE=GLVND \
- %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \
+ -DPYTHON_VERSION=%{python3_version} \
+ -DWITH_ALEMBIC=ON \
-DWITH_CYCLES=%{cyclesflag} \
- -DWITH_CYCLES_EMBREE=%{cyclesflag} \
-%ifnarch %{ix86} armv7hl
- -DWITH_CYCLES_OSL=%{cyclesflag} \
-%endif
-DWITH_DOC_MANPAGE=ON \
-DWITH_INSTALL_PORTABLE=OFF \
+ -DWITH_OPENSUBDIV=ON \
+ -DWITH_OPENVDB=ON \
+ -DWITH_OPENVDB_BLOSC=ON \
+ -DWITH_PYTHON=ON \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
- -DWITH_PYTHON_SAFETY=ON \
- -DWITH_SDL=ON \
- -DWITH_SYSTEM_LZO=ON \
- .
-%cmake_build
+ -DWITH_PYTHON_SAFETY=ON
+%cmake_build
%install
%cmake_install
-
# Thumbnailer
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/thumbnailers/%{name}.thumbnailer
@@ -244,9 +271,6 @@ install -p -m 644 -D %{SOURCE2}
%{buildroot}%{_metainfodir}/%{name}-fonts.metain
# Localization
%find_lang %{name}
-# Avoid having locales listed twice
-rm -fr %{buildroot}%{_datadir}/%{blender_api}/locale/languages
-
# 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' {} \;
@@ -265,6 +289,8 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_bindir}/%{name}-thumbnailer.py
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
+# Pulled in by the localization, avoid listing twice
+%exclude %{_datadir}/%{name}/%{blender_api}/datafiles/locale
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/thumbnailers/%{name}.thumbnailer
@@ -280,13 +306,36 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
%{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog
+* Mon Aug 24 2020 Simone Caronni <negativo17(a)gmail.com> - 1:2.83.5-2
+- Be consistent with build options format and distribution conditionals.
+- rpmlint fixes.
+- Fix build dependencies.
+- Fix Python 3.9 patch.
+- Disable OpenShadingLanguage, 1.11 is not supported.
+- Disable Embree, 3.11 is not supported.
+
+* Wed Aug 19 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.5-1
+- Update to 2.83.5 (#1855165)
+
+* Wed Aug 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.4-1
+- Update to 2.83.4 (#1855165)
+
+* Sat Aug 01 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.3-4
+- Use cmake macros for build and install
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.83.3-3
+- Second attempt - Rebuilt for
+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.83.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Jul 22 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.3-1
- Update to 2.83.3 (#1855165)
- Enable embree and osl for cycles rendering
* Thu Jul 09 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.2-2
-- Add openshadinglanguage dependency
-- Use cmake macros for build and install
+- Add openshadinglanguage dependency
- Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
* Thu Jul 09 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.2-1
@@ -354,7 +403,7 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
- Use pkgconfig for many build requirements as possible
- Replace pkgconfig(freeglut) by pkgconfig(glut) for Fedora 32 and above
- Enable OpenImageDenoise support (rhbz #1794521)
-
+
* Sat Dec 14 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81a-3
- Rebuild for openvdb 7.0.0
@@ -370,7 +419,7 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}-fonts.
* Thu Nov 21 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81-1
- Update to 2.81
- Drop upstream patch
-- Enable oidn support for x86_64 architecture
+- Enable oidn support for x86_64 architecture
- Patch on appdata fixing tags
* Sun Nov 03 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-13
diff --git a/sources b/sources
index 3617d37..10af7f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.83.3.tar.xz) =
20d284dc83bbd16ae126915a62c64a3f0860d61f66387c5fee1c549cb9002834c934b509ca3ea8475c1e7b6c683feb61862ab0e0a246808d10a632488748772f
+SHA512 (blender-2.83.5.tar.xz) =
6179b4c285d40f59b7701cafe8d2cca5d764ef15b5c390c42cfb7cf8a41704b09a4e62fcf644d76bd2b7f47bcfc96395f0afa4a1d748c4c2ba8dfdee7356df9f