From 71c66784ddf88e428ee76b0ccc4b9893a6332710 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Nov 26 2020 09:41:18 +0000
Subject: Update to 2.91.0 (#1901446)


---

diff --git a/.gitignore b/.gitignore
index edc4e82..d753b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /blender-2.90-droid.patch
 /blender-embree-library.diff
 /blender-2.90.1.tar.xz
+/blender-2.91.0.tar.xz
diff --git a/blender.spec b/blender.spec
index 4dd9161..75d11e6 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,7 +1,7 @@
 # Force out of source build
 %undefine __cmake_in_source_build
 
-%global blender_api 2.90
+%global blender_api 2.91
 
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
@@ -27,29 +27,33 @@
 %bcond_with oidn
 %endif
 
-Name:       blender
-Epoch:      1
-Version:    %{blender_api}.1
-Release:    3%{?dist}
+Name:           blender
+Epoch:          1
+Version:        %{blender_api}.0
+Release:        1%{?dist}
 
 
-Summary:    3D modeling, animation, rendering and post-production
-License:    GPLv2
-URL:        http://www.blender.org
+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}-fonts.metainfo.xml
-Source3:    %{name}.xml
-Source4:    macros.%{name}
+Source0:        http://download.%{name}.org/source/%{name}-%{version}.tar.xz
+Source1:        %{name}.thumbnailer
+Source2:        %{name}-fonts.metainfo.xml
+Source3:        %{name}.xml
+Source4:        macros.%{name}
 
 # Patch to separate built-in fonts to the fonts directory
-Patch0:     %{name}-2.90-droid.patch
+Patch0:         %{name}-2.90-droid.patch
 
 # Use EMBREE_LIBRARY otherwise build fails
 # based from Arch Linux patch
 # https://github.com/archlinux/svntogit-community/blob/packages/blender/trunk/embree.patch
-Patch1:      %{name}-embree-library.diff
+#Patch1:         %%{name}-embree-library.diff
+
+# Fix T82520: error building freestyle with Python3.8
+# https://developer.blender.org/rBe118426e4695a97d67e65d69677f3c4e2db50a56
+#Patch2:         %%{name}-freestyle-python-fix.patch
 
 # Development stuff
 BuildRequires:  boost-devel
@@ -76,7 +80,7 @@ BuildRequires:  pkgconfig(pugixml)
 %else
 BuildRequires:  pugixml-devel
 %endif
-BuildRequires:  pkgconfig(python3) >= 3.5
+BuildRequires:  pkgconfig(python3) >= 3.7
 %if %{with wayland}
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(xkbcommon)
@@ -103,9 +107,10 @@ BuildRequires:  cmake(embree)
 %endif
 BuildRequires:  opensubdiv-devel
 %if %{with openshading}
-BuildRequires:  cmake(OSL)
 # Use oslc compiler
 BuildRequires:	openshadinglanguage
+BuildRequires:  pkgconfig(oslcomp)
+BuildRequires:  pkgconfig(oslquery)
 %endif
 %if %{with oidn}
 BuildRequires:  cmake(OpenImageDenoise)
@@ -122,6 +127,7 @@ BuildRequires:  pkgconfig(freeglut)
 %endif
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(openxr)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(ode)
@@ -147,6 +153,7 @@ BuildRequires:  pkgconfig(OpenEXR)
 BuildRequires:  pkgconfig(OpenImageIO)
 BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(tbb)
+BuildRequires:  potrace-devel
 
 # Audio stuff
 BuildRequires:  pkgconfig(ao)
@@ -235,12 +242,9 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++17|' CMakeLis
 %else
     -DWITH_CODEC_FFMPEG=OFF \
 %endif
-%if %{with embree}
-    -DEMBREE_LIBRARY=%{_libdir} \
-    -DEMBREE_INCLUDE_DIR=%{_includedir} \
-%endif
-    -DWITH_CYCLES_EMBREE=OFF \
 %if %{with openshading}
+    -D_osl_LIBRARIES=%{_libdir} \
+    -DOSL_INCLUDE_DIR=%{_includedir} \
     -DOSL_COMPILER=%{_bindir}/oslc \
 %endif
 %if %{with oidn}
@@ -258,6 +262,7 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++17|' CMakeLis
     -DPYTHON_VERSION=%{python3_version} \
     -DWITH_ALEMBIC=ON \
     -DWITH_CYCLES=%{cyclesflag} \
+    -DWITH_CYCLES_EMBREE=OFF \
     -DWITH_DOC_MANPAGE=ON \
 %if %{with wayland}
     -DWITH_GHOST_WAYLAND=ON \
@@ -324,14 +329,19 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{macrosdir}/macros.%{name}
 
 %files fonts
-%license release/datafiles/LICENSE-*.ttf.txt
+%license release/license/bfont.ttf.txt
+%license release/license/bmonofont-i18n.ttf.txt
+%license release/license/droidsans.ttf.txt
 %{_fontbasedir}/%{name}/
 %{_metainfodir}/%{name}-fonts.metainfo.xml
 
 %changelog
+* Wed Nov 25 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1:2.91.0-1
+- Update to 2.91.0 (#1901446)
+
 * Mon Oct 26 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.90.1-3
 - Add hdapi, lame and vpx (webm) dependencies
-- Disable python safety (#1872980)
+- Upstream atch fixing python3 support script (#1872980)
 - Use c++17
 
 * Sat Oct 03 2020 Richard Shaw <hobbes1069@gmail.com> - 1:2.90.1-2
diff --git a/sources b/sources
index fe7e132..dbfb416 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.90.1.tar.xz) = e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
+SHA512 (blender-2.91.0.tar.xz) = a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa