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=89f56b2670...
https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=ee9e7a8b4f....
Change:
+%ifarch ppc64 ppc64le
-%ifarch x86_64 || aarch64 || ppc64le
Thanks.
Full change:
============
commit 31a9cd6b3482abe22558e0e074e3352c60ae6d02
Merge: 40a054f 21494ee
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Aug 28 12:42:26 2021 -0700
Update to 2.93.3
commit 21494ee2936b730cd2bb4cda0a7a7b06df15a417
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Aug 26 10:28:11 2021 +0200
Fix a typo in shared-mime-info, fixes rhbz#1997840
diff --git a/blender.spec b/blender.spec
index a39012b..254e320 100644
--- a/blender.spec
+++ b/blender.spec
@@ -190,7 +190,7 @@ Requires: google-droid-sans-fonts
Requires: hicolor-icon-theme
Requires: python3dist(requests)
Requires: python3dist(numpy)
-Requires: share-mime-info
+Requires: shared-mime-info
Provides: blender(ABI) = %{blender_api}
# Obsolete the standalone Blender player retired by upstream
commit c0b595537f935a6f923315d8c04a4ee9d2ed2185
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 24 12:13:32 2021 -0500
Spec file tweaks
* touch RPM macro file to prevent packaging problem until it can be
fixed properly.
* %%exclude language file directory included via find_lang so they
don't get included twice.
diff --git a/blender.spec b/blender.spec
index c9eee5e..a39012b 100644
--- a/blender.spec
+++ b/blender.spec
@@ -41,9 +41,9 @@ Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
Source1: macros.%{name}
# One-way minimal patch for OpenEXR/Imath 3.
-#if 0%{?fedora} > 34
+%if 0%{?fedora} > 34
Patch0: blender-openexr.patch
-#endif
+%endif
# Include missing pyconfig header for 3.10
Patch1: %{name}-usd-pythonlibs-fix.diff
@@ -295,7 +295,8 @@ sed -i "s/date_time/date_time
python%{python3_version_nodots}/" \
rm -rf %{buildroot}%{_docdir}/%{name}/*
# rpm macros
-#mkdir -p %{buildroot}%{macrosdir}
+mkdir -p %{buildroot}%{macrosdir}
+touch %{buildroot}%{macrosdir}/macros.%{name}
#sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE3} >
%{buildroot}%{macrosdir}/macros.%{name}
# AppData
@@ -321,6 +322,7 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_bindir}/%{name}
%{_bindir}/%{name}-thumbnailer.py
%{_datadir}/applications/%{name}.desktop
+%exclude %{_datadir}/%{name}/%{version}/datafiles/locale/
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
#{_datadir}/mime/packages/%{name}.xml
commit a718f47057828ed292e4f408dbe78e6103ea3184
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 24 11:28:20 2021 -0500
Forgot git commit -a...
diff --git a/blender-openexr.patch b/blender-openexr.patch
index 953cd03..56aef7e 100644
--- a/blender-openexr.patch
+++ b/blender-openexr.patch
@@ -1,8 +1,8 @@
-Index: blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
+Index: blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
---- blender-2.93.1.orig/source/blender/imbuf/intern/openexr/openexr_api.cpp
-+++ blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
-@@ -32,30 +32,30 @@
+--- blender-2.93.3.orig/source/blender/imbuf/intern/openexr/openexr_api.cpp
++++ blender-2.93.3/source/blender/imbuf/intern/openexr/openexr_api.cpp
+@@ -32,30 +32,31 @@
#include <stdexcept>
#include <string>
@@ -22,6 +22,7 @@ Index:
blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
-#include <ImfVersion.h>
-#include <half.h>
+#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfFrameBuffer.h>
+#include <OpenEXR/ImfChannelList.h>
+#include <OpenEXR/ImfCompression.h>
+#include <OpenEXR/ImfCompressionAttribute.h>
@@ -54,10 +55,98 @@ Index:
blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
#include "DNA_scene_types.h" /* For OpenEXR compression constants */
-Index: blender-2.93.1/build_files/cmake/Modules/FindOpenEXR.cmake
+@@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream {
+ return false;
+ }
+
+- Int64 tellg() override
++ uint64_t tellg() override
+ {
+ return _exrpos;
+ }
+
+- void seekg(Int64 pos) override
++ void seekg(uint64_t pos) override
+ {
+ _exrpos = pos;
+ }
+@@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream {
+ }
+
+ private:
+- Int64 _exrpos;
+- Int64 _exrsize;
++ uint64_t _exrpos;
++ uint64_t _exrsize;
+ unsigned char *_exrbuf;
+ };
+
+@@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream
+ return check_error();
+ }
+
+- Int64 tellg() override
++ uint64_t tellg() override
+ {
+ return std::streamoff(ifs.tellg());
+ }
+
+- void seekg(Int64 pos) override
++ void seekg(uint64_t pos) override
+ {
+ ifs.seekg(pos);
+ check_error();
+@@ -231,19 +232,19 @@ class OMemStream : public OStream {
+ ibuf->encodedsize += n;
+ }
+
+- Int64 tellp() override
++ uint64_t tellp() override
+ {
+ return offset;
+ }
+
+- void seekp(Int64 pos) override
++ void seekp(uint64_t pos) override
+ {
+ offset = pos;
+ ensure_size(offset);
+ }
+
+ private:
+- void ensure_size(Int64 size)
++ void ensure_size(uint64_t size)
+ {
+ /* if buffer is too small increase it. */
+ while (size > ibuf->encodedbuffersize) {
+@@ -254,7 +255,7 @@ class OMemStream : public OStream {
+ }
+
+ ImBuf *ibuf;
+- Int64 offset;
++ uint64_t offset;
+ };
+
+ /* File Output Stream */
+@@ -284,12 +285,12 @@ class OFileStream : public OStream {
+ check_error();
+ }
+
+- Int64 tellp() override
++ uint64_t tellp() override
+ {
+ return std::streamoff(ofs.tellp());
+ }
+
+- void seekp(Int64 pos) override
++ void seekp(uint64_t pos) override
+ {
+ ofs.seekp(pos);
+ check_error();
+Index: blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
---- blender-2.93.1.orig/build_files/cmake/Modules/FindOpenEXR.cmake
-+++ blender-2.93.1/build_files/cmake/Modules/FindOpenEXR.cmake
+--- blender-2.93.3.orig/build_files/cmake/Modules/FindOpenEXR.cmake
++++ blender-2.93.3/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -25,6 +25,7 @@
# see accompanying file BSD-3-Clause-license.txt for details.
#=============================================================================
diff --git a/blender.spec b/blender.spec
index bb83dc2..c9eee5e 100644
--- a/blender.spec
+++ b/blender.spec
@@ -41,9 +41,9 @@ Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
Source1: macros.%{name}
# One-way minimal patch for OpenEXR/Imath 3.
-%if 0%{?fedora} > 34
+#if 0%{?fedora} > 34
Patch0: blender-openexr.patch
-%endif
+#endif
# Include missing pyconfig header for 3.10
Patch1: %{name}-usd-pythonlibs-fix.diff
@@ -52,6 +52,11 @@ Patch1: %{name}-usd-pythonlibs-fix.diff
#
https://developer.blender.org/T90842
Patch2: %{name}-usd-writer-abstract-fix.diff
+# Fix borrowed from:
+#
https://github.com/numpy/numpy/commit/ad2a73c18dcff95d844c382c94ab7f73b55...
+Patch3: blender-python310.patch
+
+
# Development stuff
BuildRequires: boost-devel
%if %{with clang}
@@ -226,11 +231,16 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
%py3_shebang_fix .
# Workaround for eigen3 trying to enforce power10 when fedora only supports power8.
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1996330
%ifarch ppc64 ppc64le
%global optflags_orig %optflags
%global optflags %optflags_orig -DEIGEN_ALTIVEC_DISABLE_MMA
%endif
+# Work around CMake boost module needing the python version to find the library
+sed -i "s/date_time/date_time python%{python3_version_nodots}/" \
+ build_files/cmake/platform/platform_unix.cmake
+
%build
%cmake \
@@ -285,8 +295,8 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
rm -rf %{buildroot}%{_docdir}/%{name}/*
# rpm macros
-mkdir -p %{buildroot}%{macrosdir}
-sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE3} >
%{buildroot}%{macrosdir}/macros.%{name}
+#mkdir -p %{buildroot}%{macrosdir}
+#sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE3} >
%{buildroot}%{macrosdir}/macros.%{name}
# AppData
install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \
@@ -313,8 +323,8 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/thumbnailers/%{name}.thumbnailer
+#{_datadir}/mime/packages/%{name}.xml
+#{_datadir}/thumbnailers/%{name}.thumbnailer
%{_mandir}/man1/%{name}.*
%{_metainfodir}/%{name}.appdata.xml
commit d183f29dc4da1f62e9bf36baf05fd198e7f0bc22
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 24 11:25:44 2021 -0500
Multiple build problem fixes:
* Add python 3.10 patch fix.
* Link with boost_python library.
* Comment out RPM macro install as SOURCE3 doesn't exist.
* Comment out blender.xml and blender.thumbnailer as they are not
currently being installed.
diff --git a/blender-python310.patch b/blender-python310.patch
new file mode 100644
index 0000000..7cd6662
--- /dev/null
+++ b/blender-python310.patch
@@ -0,0 +1,16 @@
+Index: blender-2.93.3/source/blender/python/mathutils/mathutils.c
+===================================================================
+--- blender-2.93.3.orig/source/blender/python/mathutils/mathutils.c
++++ blender-2.93.3/source/blender/python/mathutils/mathutils.c
+@@ -95,7 +95,11 @@ Py_hash_t mathutils_array_hash(const flo
+ x = 0x345678UL;
+ i = 0;
+ while (--len >= 0) {
++#if PY_VERSION_HEX >= 0x30a0000 /* Version: 3.10. */
++ y = _Py_HashDouble(NULL, (double)(array[i++]));
++#else
+ y = _Py_HashDouble((double)(array[i++]));
++#endif
+ if (y == -1) {
+ return -1;
+ }
commit 89f56b26705f1b2fd9a01cc71c31012ee0c60934
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Aug 23 21:28:46 2021 -0500
Try workaround for Eigen3 power10 vs Fedora power8 issue.
diff --git a/blender.spec b/blender.spec
index 13086af..bb83dc2 100644
--- a/blender.spec
+++ b/blender.spec
@@ -225,6 +225,13 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
# Fix all Python shebangs recursively in .
%py3_shebang_fix .
+# Workaround for eigen3 trying to enforce power10 when fedora only supports power8.
+%ifarch ppc64 ppc64le
+%global optflags_orig %optflags
+%global optflags %optflags_orig -DEIGEN_ALTIVEC_DISABLE_MMA
+%endif
+
+
%build
%cmake \
%if %{with ffmpeg}
commit f169b3195805ac9c3f076e63b4e5c0ddc1483df4
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Aug 23 21:14:28 2021 -0500
Rebuild for OpenColorIO 2.
commit f133d7a5a9273bcf92bd21f38bc34bf3fbcd2317
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Aug 21 20:31:59 2021 -0700
Various fixes
Fix USD support
Enable OSL support for x64 architecture
diff --git a/blender-usd-pythonlibs-fix.diff b/blender-usd-pythonlibs-fix.diff
new file mode 100644
index 0000000..28fd72e
--- /dev/null
+++ b/blender-usd-pythonlibs-fix.diff
@@ -0,0 +1,20 @@
+diff -ru blender-2.93.3-original/source/blender/io/usd/CMakeLists.txt
blender-2.93.3/source/blender/io/usd/CMakeLists.txt
+--- blender-2.93.3-original/source/blender/io/usd/CMakeLists.txt 2021-04-20
19:02:39.000000000 -0700
++++ blender-2.93.3/source/blender/io/usd/CMakeLists.txt 2021-08-19 22:52:43.578924282
-0700
+@@ -53,6 +53,7 @@
+ ${USD_INCLUDE_DIRS}
+ ${BOOST_INCLUDE_DIR}
+ ${TBB_INCLUDE_DIR}
++ ${PYTHON_INCLUDE_DIRS}
+ )
+
+ set(SRC
+@@ -86,6 +87,8 @@
+
+ list(APPEND LIB
+ ${BOOST_LIBRARIES}
++ ${PYTHON_LINKFLAGS}
++ ${PYTHON_LIBRARIES}
+ )
+
+ list(APPEND LIB
diff --git a/blender-usd-writer-abstract-fix.diff b/blender-usd-writer-abstract-fix.diff
new file mode 100644
index 0000000..7b36a8f
--- /dev/null
+++ b/blender-usd-writer-abstract-fix.diff
@@ -0,0 +1,14 @@
+diff -Naur blender-2.93.3.original/source/blender/io/usd/intern/usd_writer_abstract.cc
blender-2.93.3/source/blender/io/usd/intern/usd_writer_abstract.cc
+---
blender-2.93.3.original/source/blender/io/usd/intern/usd_writer_abstract.cc 2021-04-20
19:02:39.000000000 -0700
++++ blender-2.93.3/source/blender/io/usd/intern/usd_writer_abstract.cc 2021-08-21
18:39:23.531036813 -0700
+@@ -102,7 +102,9 @@
+ shader.CreateInput(usdtokens::metallic,
pxr::SdfValueTypeNames->Float).Set(material->metallic);
+
+ /* Connect the shader and the material together. */
+- usd_material.CreateSurfaceOutput().ConnectToSource(shader, usdtokens::surface);
++ usd_material.CreateSurfaceOutput().ConnectToSource(
++ shader.ConnectableAPI(),
++ usdtokens::surface);
+
+ return usd_material;
+ }
diff --git a/blender.spec b/blender.spec
index cf4428c..13086af 100644
--- a/blender.spec
+++ b/blender.spec
@@ -4,8 +4,8 @@
%bcond_with clang
%bcond_with ffmpeg
# Needed to enable osl support for cycles rendering
-%bcond_with llvm
-%bcond_with openshading
+%bcond_without llvm
+%bcond_without openshading
%bcond_without system_eigen3
%bcond_with wayland
@@ -32,6 +32,7 @@ Epoch: 1
Version: %{blender_api}.3
Release: %autorelease
+
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
URL:
http://www.blender.org
@@ -45,7 +46,11 @@ Patch0: blender-openexr.patch
%endif
# Include missing pyconfig header for 3.10
-#Patch: %%{name}-usd-pythonlibs-fix.diff
+Patch1: %{name}-usd-pythonlibs-fix.diff
+
+# Fix USD build
+#
https://developer.blender.org/T90842
+Patch2: %{name}-usd-writer-abstract-fix.diff
# Development stuff
BuildRequires: boost-devel
@@ -95,13 +100,14 @@ BuildRequires: pkgconfig(lzo2)
BuildRequires: pkgconfig(zlib)
# 3D modeling stuff
+BuildRequires: cmake(ceres)
%if %{with embree}
BuildRequires: cmake(embree)
%endif
BuildRequires: opensubdiv-devel
%if %{with openshading}
# Use oslc compiler
-BuildRequires: openshadinglanguage
+BuildRequires: openshadinglanguage-common-headers
BuildRequires: pkgconfig(oslcomp)
%endif
%if %{with oidn}
@@ -143,7 +149,8 @@ BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(libwebp)
-BuildRequires: pkgconfig(OpenColorIO)
+# OpenColorIO 2 and up required
+BuildRequires: pkgconfig(OpenColorIO) > 1
%if 0%{?fedora} > 34
BuildRequires: cmake(Imath)
BuildRequires: cmake(OpenEXR)
commit c27e6f82ce692bea53d8456952f6c0168abb8136
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 19 15:43:10 2021 +0200
Update to 2.93.3
diff --git a/.gitignore b/.gitignore
index 2532ea9..cc8694c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,70 +1,4 @@
/$package_name-*/
-/blender-2.49b-repack.tar.bz2
-/blender-2.56-beta.tar.gz
-/blender-2.56.svn35722.tar.bz2
-/blender-2.56.svn36007.tar.bz2
-/blender-2.57.svn36147.tar.bz2
-/blender-2.57.tar.gz
-/blender-2.57b.tar.gz
-/blender-2.58.tgz
-/blender-2.58a.tar.gz
-/blender-2.59.tar.gz
-/blender-2.60.tar.gz
-/blender-2.60a.tar.gz
-/blender-2.61.tar.gz
-/blender-2.62.tar.gz
-/blender-2.63.tar.gz
-/blender-2.63a.tar.gz
-/blender-2.64.tar.gz
-/blender-2.64a.tar.gz
-/blender-2.65.tar.gz
-/blender-2.65a.tar.gz
-/blender-2.66.tar.gz
-/blender-2.66a.tar.gz
-/blender-2.67.tar.gz
-/blender-2.67a.tar.gz
-/blender-2.67b.tar.gz
-/blender-2.68a.tar.gz
-/blender-2.69.tar.gz
-/blender-2.70.tar.gz
-/blender-2.70a.tar.gz
-/blender-2.71.tar.gz
-/blender-2.72.tar.gz
-/blender-2.72b.tar.gz
-/blender-2.73.tar.gz
-/blender-2.73a.tar.gz
-/blender-2.74.tar.gz
-/blender-2.75.tar.gz
-/blender-2.76.tar.gz
-/blender-2.77a.tar.gz
-/blender-2.78.tar.gz
-/blender-2.78a.tar.gz
-/blender-2.78b.tar.gz
-/blender-2.78c.tar.gz
-/blender-2.79.tar.gz
-/blender-2.79a.tar.gz
-/blender-2.79b.tar.gz
-/blender-2.80.tar.gz
-/blender-2.80-fix_compatibility_python-3.8.patch
-/blender-2.81.tar.xz
-/blender-2.81a.tar.xz
-/blender-2.81a-add_ppc64le_support.patch
-/blender-2.81a-appdata-fix-tags.patch
-/blender-2.81a-droid.patch
-/blender-2.82.tar.xz
-/blender-2.82a.tar.xz
-/blender-2.83.0.tar.xz
-/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
-/blender-2.90.0.tar.xz
-/blender-2.90-droid.patch
-/blender-embree-library.diff
-/blender-2.90.1.tar.xz
-/blender-2.91.0.tar.xz
-/blender-2.91.2.tar.xz
-/blender-2.92.0.tar.xz
-/blender-2.93.0.tar.xz
-/blender-2.93.1.tar.xz
+blender-*.tar.gz
+blender-*.tar.bz2
+blender-*.tar.xz
diff --git a/blender.spec b/blender.spec
index 95126ec..cf4428c 100644
--- a/blender.spec
+++ b/blender.spec
@@ -29,7 +29,7 @@
Name: blender
Epoch: 1
-Version: %{blender_api}.1
+Version: %{blender_api}.3
Release: %autorelease
Summary: 3D modeling, animation, rendering and post-production
diff --git a/sources b/sources
index 04fe7be..b24419c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.93.1.tar.xz) =
b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
+SHA512 (blender-2.93.3.tar.xz) =
ac818b3100bc922c23318b3a9c53d50f728b3fef683c47f5c9b880f0ffdebbe2639e5e07c72b75ab099c592f915131d45666b2bc0d9c351694d09c162fc58d6e
commit 14b97c78d64d3ab62ef5e9af0fa40f528a51acae
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Aug 17 18:14:48 2021 -0500
Add minimal patch for OpenEXR/Imath 3 compatibility.
diff --git a/blender-openexr.patch b/blender-openexr.patch
new file mode 100644
index 0000000..953cd03
--- /dev/null
+++ b/blender-openexr.patch
@@ -0,0 +1,103 @@
+Index: blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
+===================================================================
+--- blender-2.93.1.orig/source/blender/imbuf/intern/openexr/openexr_api.cpp
++++ blender-2.93.1/source/blender/imbuf/intern/openexr/openexr_api.cpp
+@@ -32,30 +32,30 @@
+ #include <stdexcept>
+ #include <string>
+
+-#include <Iex.h>
++#include <OpenEXR/Iex.h>
+ #include <ImathBox.h>
+-#include <ImfArray.h>
+-#include <ImfChannelList.h>
+-#include <ImfCompression.h>
+-#include <ImfCompressionAttribute.h>
+-#include <ImfIO.h>
+-#include <ImfInputFile.h>
+-#include <ImfOutputFile.h>
+-#include <ImfPixelType.h>
+-#include <ImfStandardAttributes.h>
+-#include <ImfStringAttribute.h>
+-#include <ImfVersion.h>
+-#include <half.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfChannelList.h>
++#include <OpenEXR/ImfCompression.h>
++#include <OpenEXR/ImfCompressionAttribute.h>
++#include <OpenEXR/ImfIO.h>
++#include <OpenEXR/ImfInputFile.h>
++#include <OpenEXR/ImfOutputFile.h>
++#include <OpenEXR/ImfPixelType.h>
++#include <OpenEXR/ImfStandardAttributes.h>
++#include <OpenEXR/ImfStringAttribute.h>
++#include <OpenEXR/ImfVersion.h>
++#include <Imath/half.h>
+
+ /* multiview/multipart */
+-#include <ImfInputPart.h>
+-#include <ImfMultiPartInputFile.h>
+-#include <ImfMultiPartOutputFile.h>
+-#include <ImfMultiView.h>
+-#include <ImfOutputPart.h>
+-#include <ImfPartHelper.h>
+-#include <ImfPartType.h>
+-#include <ImfTiledOutputPart.h>
++#include <OpenEXR/ImfInputPart.h>
++#include <OpenEXR/ImfMultiPartInputFile.h>
++#include <OpenEXR/ImfMultiPartOutputFile.h>
++#include <OpenEXR/ImfMultiView.h>
++#include <OpenEXR/ImfOutputPart.h>
++#include <OpenEXR/ImfPartHelper.h>
++#include <OpenEXR/ImfPartType.h>
++#include <OpenEXR/ImfTiledOutputPart.h>
+
+ #include "DNA_scene_types.h" /* For OpenEXR compression constants */
+
+Index: blender-2.93.1/build_files/cmake/Modules/FindOpenEXR.cmake
+===================================================================
+--- blender-2.93.1.orig/build_files/cmake/Modules/FindOpenEXR.cmake
++++ blender-2.93.1/build_files/cmake/Modules/FindOpenEXR.cmake
+@@ -25,6 +25,7 @@
+ # see accompanying file BSD-3-Clause-license.txt for details.
+ #=============================================================================
+
++
+ # If OPENEXR_ROOT_DIR was defined in the environment, use it.
+ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
+ SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
+@@ -33,6 +34,16 @@ ENDIF()
+ # Old versions (before 2.0?) do not have any version string, just assuming this should
be fine though.
+ SET(_openexr_libs_ver_init "2.0")
+
++find_package(Imath CONFIG QUIET)
++if(TARGET Imath::Imath)
++SET(_openexr_FIND_COMPONENTS
++ Imath
++ Iex
++ OpenEXR
++ IlmThread
++)
++
++else()
+ SET(_openexr_FIND_COMPONENTS
+ Half
+ Iex
+@@ -40,6 +51,7 @@ SET(_openexr_FIND_COMPONENTS
+ IlmThread
+ Imath
+ )
++endif()
+
+ SET(_openexr_SEARCH_DIRS
+ ${OPENEXR_ROOT_DIR}
+@@ -121,6 +133,9 @@ IF(OPENEXR_FOUND)
+ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+ # Both include paths are needed because of dummy OSL headers mixing #include
<OpenEXR/foo.h> and #include <foo.h> :(
+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
++ if(TARGET Imath::Imath)
++ list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
++ endif()
+ ENDIF()
+
+ MARK_AS_ADVANCED(
diff --git a/blender.spec b/blender.spec
index b7b8023..95126ec 100644
--- a/blender.spec
+++ b/blender.spec
@@ -39,6 +39,11 @@ URL:
http://www.blender.org
Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
Source1: macros.%{name}
+# One-way minimal patch for OpenEXR/Imath 3.
+%if 0%{?fedora} > 34
+Patch0: blender-openexr.patch
+%endif
+
# Include missing pyconfig header for 3.10
#Patch: %%{name}-usd-pythonlibs-fix.diff
@@ -139,7 +144,12 @@ BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(OpenColorIO)
+%if 0%{?fedora} > 34
+BuildRequires: cmake(Imath)
+BuildRequires: cmake(OpenEXR)
+%else
BuildRequires: pkgconfig(OpenEXR)
+%endif
BuildRequires: pkgconfig(OpenImageIO)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(tbb)
commit ee9e7a8b4f9fb03579192ea43c0924c19f0d6204
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sun Aug 1 00:30:36 2021 -0700
Update to 2.93.1
diff --git a/.gitignore b/.gitignore
index b210755..2532ea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
/blender-2.91.2.tar.xz
/blender-2.92.0.tar.xz
/blender-2.93.0.tar.xz
+/blender-2.93.1.tar.xz
diff --git a/blender.spec b/blender.spec
index a2b8d06..b7b8023 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,53 +1,54 @@
-# Force out of source build
-%undefine __cmake_in_source_build
-
%global blender_api 2.93
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo
$d)
%bcond_with clang
%bcond_with ffmpeg
+# Needed to enable osl support for cycles rendering
+%bcond_with llvm
%bcond_with openshading
%bcond_without system_eigen3
%bcond_with wayland
+%ifarch x86_64 || aarch64 || ppc64le
+%global cyclesflag ON
# Only available on x86_64
%ifarch x86_64
%bcond_without embree
%bcond_without hidapi
%bcond_without oidn
-%bcond_with usd
+%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
%global cyclesflag OFF
%endif
Name: blender
Epoch: 1
-Version: %{blender_api}.0
-Release: 5%{?dist}
-
+Version: %{blender_api}.1
+Release: %autorelease
Summary: 3D modeling, animation, rendering and post-production
License: GPLv2
URL:
http://www.blender.org
Source0:
http://download.%{name}.org/source/%{name}-%{version}.tar.xz
-Source1: %{name}.thumbnailer
-Source2: %{name}.xml
-Source3: macros.%{name}
+Source1: macros.%{name}
+
+# Include missing pyconfig header for 3.10
+#Patch: %%{name}-usd-pythonlibs-fix.diff
# Development stuff
BuildRequires: boost-devel
%if %{with clang}
-BuildRequires: clang-devel
+BuildRequires: clang
+%endif
+%if %{with llvm}
+BuildRequires: llvm-devel
%endif
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -56,7 +57,7 @@ BuildRequires: gettext
BuildRequires: git-core
BuildRequires: libharu-devel
BuildRequires: libtool
-BuildRequires: llvm-devel
+
BuildRequires: pkgconfig(blosc)
%if %{with system_eigen3}
BuildRequires: pkgconfig(eigen3)
@@ -167,6 +168,7 @@ Requires: google-droid-sans-fonts
Requires: hicolor-icon-theme
Requires: python3dist(requests)
Requires: python3dist(numpy)
+Requires: share-mime-info
Provides: blender(ABI) = %{blender_api}
# Obsolete the standalone Blender player retired by upstream
@@ -204,7 +206,7 @@ packages to extend Blender.
rm -f build_files/cmake/Modules/FindOpenJPEG.cmake
# Fix all Python shebangs recursively in .
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
+%py3_shebang_fix .
%build
%cmake \
@@ -217,11 +219,6 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-D_osl_LIBRARIES=%{_libdir} \
-DOSL_INCLUDE_DIR=%{_includedir} \
-DOSL_COMPILER=%{_bindir}/oslc \
-%endif
-%if %{with oidn}
- -DOPENIMAGEDENOISE_LIBRARY=%{_libdir} \
- -DOPENIMAGEDENOISE_INCLUDE_DIR=%{_includedir} \
- -DWITH_OPENIMAGEDENOISE=ON \
%endif
-DBOOST_ROOT=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
@@ -232,7 +229,6 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-DCMAKE_SKIP_RPATH=ON \
-DOpenGL_GL_PREFERENCE=GLVND \
-DPYTHON_VERSION=%{python3_version} \
- -DWITH_ALEMBIC=ON \
-DWITH_CYCLES=%{cyclesflag} \
%ifnarch x86_64
-DWITH_CYCLES_EMBREE=OFF \
@@ -240,14 +236,10 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-DWITH_DOC_MANPAGE=ON \
%if %{with wayland}
-DWITH_GHOST_WAYLAND=ON \
- -DWITH_XR_OPENXR=OFF \
+ -DWITH_GL_EGL=ON \
%endif
- -DWITH_CLANG=OFF \
-DWITH_INSTALL_PORTABLE=OFF \
- -DWITH_LLVM=ON \
- -DWITH_OPENSUBDIV=ON \
- -DWITH_OPENVDB=ON \
- -DWITH_OPENVDB_BLOSC=ON \
+ -DWITH_NANOVDB=OFF \
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_PYTHON_INSTALL_REQUESTS=OFF \
%if %{with system_eigen3}
@@ -265,12 +257,6 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
%install
%cmake_install
-# Thumbnailer
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/thumbnailers/%{name}.thumbnailer
-
-# Mime support
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
-
# Deal with docs in the files section
rm -rf %{buildroot}%{_docdir}/%{name}/*
@@ -312,321 +298,4 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
-* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.93.0-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-4
-- Disable usd support due to broken dependencies
-
-* Fri Jun 11 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-3
-- Rebuild for openxr 1.0.17
-- Rebuild for alembic 1.8.2
-- Enable usd support
-
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-2
-- Rebuilt for Python 3.10
-
-* Wed Jun 02 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.93.0-1
-- Update to 2.93.0 (#1967342)
-- Add libharu and libpulse dependencies
-
-* Mon May 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-10
-- Rebuild for opensubdib 3.4.4
-
-* Mon May 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-9
-- Rebuild for alembic 1.8.1 and oidn 1.4.0
-- Disable USD support due to build failure
-
-* Mon May 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-8
-- Rebuild for openxr 1.10.6
-- Drop no longer needed eigen3 patch
-- Use system eigen3
-- Drop conditional for EOL Fedora 31
-
-* Mon May 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-7
-- Rebuild for embree 3.13.0
-
-* 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)
-
-* Mon Apr 19 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-4
-- Rebuild for openxr 1.0.15
-- Drop support of Fedora 31 which is EOL
-- Add LLVM dependencies
-- Support CXX Standard 17
-
-* Thu Apr 08 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.92.0-3
-- Rebuild for alembic 1.8.0_beta2
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:2.92.0-2
-- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Thu Feb 25 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.92.0-1
-- Update to 2.92.0 (#1932861)
-- Rebuild for embree 3.12.2
-
-* Sun Feb 07 2021 Luya Tshimbalanga <luya_tfz(a)thefinalzone.net> - 1:2.91.2-4
-- Rebuild for oidn 1.3.0
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.91.2-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 24 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.2-2
-- Rebuild for opensubdiv with enabled ptex
-
-* Wed Jan 20 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.2-1
-- Update to 2.91.2 (#1918303)
-
-* Mon Jan 18 2021 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:2.91.0-7
-- Backport eigen3 log1p fix for now
-
-* Mon Jan 18 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.91.0-7
-- Drop blender font patch
-
-* Mon Jan 18 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.0-6
-- Obsolete subpackage blender-fonts(#1917244)
-
-* Sun Jan 10 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.91.0-5
-- Rebuild for OpenEXR 2.5.4
-- Drop patch for fonts path (#1889049)
-
-* Mon Jan 04 2021 Miro Hrončok <mhroncok(a)redhat.com> - 1:2.91.0-4
-- Rebuild for new libopenvdb
-- Fixes: rhbz#1912498
-
-* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.91.0-3
-- Rebuild for OpenEXR 2.5.3.
-
-* Fri Nov 27 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-2
-- Rebuild for embree 3.12.1
-
-* Wed Nov 25 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.91.0-1
-- Update to 2.91.0 (#1901446)
-
-* Mon Oct 26 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-3
-- Add hdapi, lame and vpx (webm) dependencies
-- Upstream atch fixing python3 support script (#1872980)
-- Use c++17
-
-* Sat Oct 03 2020 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.90.1-2
-- Rebuild for OpenImageIO 2.2.
-
-* Wed Sep 23 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.1-1
-- Update to 2.90.1 (#1881831)
-
-* Sat Sep 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.0-4
-- Rebuild for oidn 1.2.3
-
-* Sat Sep 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.0-3
-- Build exclusively on 64-bits architectures due to upstream change
-
-* Sat Sep 05 2020 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.90.0-2
-- Rebuild for OpenImageIO 2.2.
-
-* Mon Aug 31 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.90.0-1
-- Update to 2.90.0 (#1855165)
-- Disable embree for cycle rendering
-- Add initial Wayland support and set disabled by default
-- Remove unused brp-python-bytecompile script declaration
-- Remove python 3.9 patch
-
-* Thu Aug 27 2020 Simone Caronni <negativo17(a)gmail.com> - 1:2.83.5-5
-- Revert change for not listing locale files twice, it's preventing localization
- to be included in the package.
-
-* Tue Aug 25 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.5-4
-- Temporarily exclude s390x secondary arch
-
-* Tue Aug 25 2020 Charalampos Stratakis <cstratak(a)redhat.com> - 1:2.83.5-3
-- Use c++14 for properly building with the latest version of openvdb
-
-* 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
-- 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
-- Update to 2.83.2 (#1855165)
-
-* Thu Jun 25 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.1-1
-- Update to 2.83.1 (#1843623)
-
-* Sun Jun 21 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.0-4
-- Apply upstream patch to build on Python 3.9 (#1843100)
-
-* Sun Jun 21 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.0-3
-- Fix installtion path for fonts directory (#1849429)
-- More conversion to pkgconf format
-
-* Sat Jun 20 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.0-2
-- Remove undocumented and undefined function on Python 3.9
-- Use documented python function defined on Python 3.9 (#1843100)
-
-* Sun Jun 14 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.0-1.1
-- Temporarily exclude ARM architecture (#1843100)
-
-* Wed Jun 03 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.83.0-1
-- Update to 2.83.0 (#1843623)
-- Clean up spec file
-
-* Tue May 12 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82a-5
-- Rebuild for embree 3.10.0
-
-* Mon May 11 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1:2.82a-4
-- Rebuild for new LibRaw
-
-* Sat Apr 11 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82a-3
-- Rebuild for oidn 1.2.0
-
-* Sat Apr 04 2020 Simone Caronni <negativo17(a)gmail.com> - 1:2.82a-2
-- Remove unfinished RHEL 7 support in SPEC file.
-- Move desktop file validation to check section.
-- Fix FFmpeg conditional.
-- Explicitly declare version in patch, hopefully it does not require an udpate.
-- Trim changelog.
-
-* Sat Mar 14 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82a-1
-- Update to 2.82a (#1810743)
-
-* Thu Mar 05 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82-3
-- Add Obsolete blenderplayer line for system upgrade (#1810743)
-
-* Sun Feb 23 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82-2
-- Patch for upstream invalid appdata causing segmentation fault
-
-* Thu Feb 13 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.82-1
-- Update to 2.82 (#1802530)
-- Drop custom cmake parameters set by default on upstream
-- Disable default upstream ffmpeg support due to patents issue
-- Temporarily disable appstream validation
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.81a-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 27 2020 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.81a-5
-- Rebuild for OpenImageIO 2.1.10.1.
-
-* Fri Jan 24 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81a-4
-- 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
-
-* Thu Dec 12 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81a-2
-- Rebuilt for openvdb 7.0.0
-
-* Thu Dec 05 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81a-1
-- Update to 2.81a
-
-* Thu Nov 21 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.81-2
-- Temporarily exclude ppc64le and armv7hl architectures due to failure
-
-* 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
-- Patch on appdata fixing tags
-
-* Sun Nov 03 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-13
-- Rebuilt for alembic 1.7.12
-
-* Sat Nov 02 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-12
-- Rebuilt with opensubdiv
-
-* Wed Oct 16 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-11
-- Upstream patch fixing compatibility with python 3.8
-
-* Sun Oct 13 2019 Simone Caronni <negativo17(a)gmail.com> - 1:2.80-10
-- Actually re-enable OpenVDB.
-
-* Tue Sep 24 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-9
-- Enable OpenSubDiv (rhbz#1754797)
-- Rebuilt for openvdb 6.2.0
-- Use provided upsteam metadata
-
-* Thu Aug 22 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1:2.80-8
-- Rebuilt for Python 3.8
-
-* Mon Aug 19 2019 Simone Caronni <negativo17(a)gmail.com> - 1:2.80-7
-- Enable OpenVDB.
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1:2.80-6
-- Rebuilt for Python 3.8
-
-* Sun Aug 18 2019 Simone Caronni <negativo17(a)gmail.com> - 1:2.80-5
-- Clean up patches/sources.
-- Fix installation of locales, scripts, thumbnailer, etc.
-- Rpmlint fixes.
-- Add ppc64le and s390x support.
-
-* Thu Aug 15 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-4
-- Restore broken international fonts support
-
-* Wed Aug 14 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-3
-- Set embree dependency to x86_64 architecture
-- Temporarily disable build for ppc64le and s390x
-
-* Tue Jul 30 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-2
-- Enable embree, webp and bzip support
-- Remove game engine support dropped from upstream
-- Drop blenderplayer standalone package
-
-* Tue Jul 30 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.80-1
-- Update to 2.80
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.79b-18
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat May 18 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.79b-17
-- Rebuild for alembic 1.7.11
-
-* Wed Apr 10 2019 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.79b-16
-- Rebuild for OpenEXR 2.3.0.
-
-* Thu Apr 04 2019 Richard Shaw <hobbes1069(a)gmail.com> - 1:2.79b-15
-- Rebuild for OpenColorIO 1.1.1.
-
-* Wed Apr 03 01:33:05 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> -
1:2.79b-14
-- Fix build for GCC9 new OpenMP data sharing
-
-* Thu Mar 14 2019 Mohan Boddu <mboddu(a)bhujji.com> - 1:2.79b-13
-- Rebuild for OpenImageIO 2.0.5
-
-* Thu Mar 14 2019 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.79b-12
-- Rebuild for boost 1.69
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.79b-11
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%autochangelog
diff --git a/blender.xml b/blender.xml
deleted file mode 100644
index 131b020..0000000
--- a/blender.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info
xmlns="https://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-blender">
- <comment xml:lang="en">Blender Scene</comment>
- <glob pattern="*.blend" />
- </mime-type>
-</mime-info>
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..d36e208
--- /dev/null
+++ b/changelog
@@ -0,0 +1,138 @@
+* 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 1a8a481..04fe7be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.93.0.tar.xz) =
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
+SHA512 (blender-2.93.1.tar.xz) =
b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
commit b4ce269da14ff57df104089cfca2d91de95bf5ce
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 18:40:48 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/blender.spec b/blender.spec
index 4cdab0b..a2b8d06 100644
--- a/blender.spec
+++ b/blender.spec
@@ -32,7 +32,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -312,6 +312,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:2.93.0-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-4
- Disable usd support due to broken dependencies
commit 0527263b80de2c41c76429bc758a470de9ddf118
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 13:43:51 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 1e29891d0bea8ba9463ae7b8b498c149830ca295
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Jun 15 08:25:16 2021 -0700
Disable usd support due to broken dependencies
diff --git a/blender.spec b/blender.spec
index 3b17c19..4cdab0b 100644
--- a/blender.spec
+++ b/blender.spec
@@ -15,7 +15,7 @@
%bcond_without embree
%bcond_without hidapi
%bcond_without oidn
-%bcond_without usd
+%bcond_with usd
%else
%bcond_with embree
%bcond_with hidapi
commit e3b0471a481ad7ebc0866ca8f9042c2548af68be
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Jun 15 08:23:49 2021 -0700
Disable usd support due to broken dependencies
diff --git a/blender.spec b/blender.spec
index 27daeaa..3b17c19 100644
--- a/blender.spec
+++ b/blender.spec
@@ -32,7 +32,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -312,6 +312,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Tue Jun 15 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-4
+- Disable usd support due to broken dependencies
+
* Fri Jun 11 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-3
- Rebuild for openxr 1.0.17
- Rebuild for alembic 1.8.2
commit 09b476137d2bbc8f9e3fc6c127076f31324a630a
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Mon Jun 14 17:19:33 2021 -0700
Rebuild for openxr 1.0.17
Rebuild for alembic 1.8.2
Enable usd support
diff --git a/blender.spec b/blender.spec
index 57cc727..27daeaa 100644
--- a/blender.spec
+++ b/blender.spec
@@ -315,6 +315,7 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
* Fri Jun 11 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-3
- Rebuild for openxr 1.0.17
- Rebuild for alembic 1.8.2
+- Enable usd support
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-2
- Rebuilt for Python 3.10
commit 54c43fef7a8b24b8016639e29dbc86fd63bbc7d3
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Mon Jun 14 17:12:44 2021 -0700
Rebuild for openxr 1.0.17
Rebuild for alembic 1.8.2
diff --git a/blender.spec b/blender.spec
index f686944..57cc727 100644
--- a/blender.spec
+++ b/blender.spec
@@ -15,7 +15,7 @@
%bcond_without embree
%bcond_without hidapi
%bcond_without oidn
-%bcond_with usd
+%bcond_without usd
%else
%bcond_with embree
%bcond_with hidapi
@@ -312,7 +312,11 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-3
+* Fri Jun 11 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1:2.93.0-3
+- Rebuild for openxr 1.0.17
+- Rebuild for alembic 1.8.2
+
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-2
- Rebuilt for Python 3.10
* Wed Jun 02 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.93.0-1
commit b0d507862ca35d14d91a47bbc0631115b3a2bc0f
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Jun 10 23:40:50 2021 -0700
Rebuild for openxr 1.0.17
Rebuild for alembic 1.8.2
diff --git a/blender.spec b/blender.spec
index 9a542fa..f686944 100644
--- a/blender.spec
+++ b/blender.spec
@@ -32,7 +32,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -312,7 +312,7 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-2
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-3
- Rebuilt for Python 3.10
* Wed Jun 02 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.93.0-1
commit f4a93add76a541d9e1464d36ca65991af6e57c14
Author: Python Maint <python-maint(a)redhat.com>
Date: Fri Jun 4 20:00:27 2021 +0200
Rebuilt for Python 3.10
diff --git a/blender.spec b/blender.spec
index 2e7fd86..9a542fa 100644
--- a/blender.spec
+++ b/blender.spec
@@ -32,7 +32,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -312,6 +312,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{name}.appdat
%{macrosdir}/macros.%{name}
%changelog
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:2.93.0-2
+- Rebuilt for Python 3.10
+
* Wed Jun 02 2021 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1:2.93.0-1
- Update to 2.93.0 (#1967342)
- Add libharu and libpulse dependencies