Notification time stamped 2021-08-28 19:54:57 UTC
From a718f47057828ed292e4f408dbe78e6103ea3184 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Aug 24 2021 16:28:20 +0000
Subject: 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
https://src.fedoraproject.org/rpms/blender/c/a718f47057828ed292e4f408dbe7...