From e9e5fec5dd0c1905b7a15ec3965fb19a03644eac Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sep 05 2020 06:12:59 +0000
Subject: 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

---

diff --git a/.gitignore b/.gitignore
index 84dbb18..63b9247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
 /blender-2.83.3.tar.xz
 /blender-2.83.4.tar.xz
 /blender-2.83.5.tar.xz
+/blender-2.90.0.tar.xz
diff --git a/blender.spec b/blender.spec
index af26098..28baeef 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,10 +1,7 @@
 # Force out of source build
 %undefine __cmake_in_source_build
 
-%global blender_api 2.83
-
-# Turn off the brp-python-bytecompile script
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+%global blender_api 2.90
 
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
@@ -16,7 +13,8 @@
 
 %bcond_with ffmpeg
 %bcond_with openshading
-%bcond_with embree
+%bcond_without embree
+%bcond_with wayland
 
 # Only available on x86_64
 %ifarch x86_64
@@ -27,8 +25,8 @@
 
 Name:       blender
 Epoch:      1
-Version:    %{blender_api}.5
-Release:    5%{?dist}
+Version:    %{blender_api}.0
+Release:    1%{?dist}
 
 Summary:    3D modeling, animation, rendering and post-production
 License:    GPLv2
@@ -41,11 +39,12 @@ Source3:    %{name}.xml
 Source4:    macros.%{name}
 
 # Patch to separate built-in fonts to the fonts directory
-Patch0:     %{name}-%{blender_api}-droid.patch
+Patch0:     %{name}-2.90-droid.patch
 
-# Upstream fix to support Python 3.9
-# https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f
-Patch1:     %{name}-support-python-3.9.diff
+# 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
 
 # Development stuff
 BuildRequires:  boost-devel
@@ -69,6 +68,10 @@ BuildRequires:  pkgconfig(pugixml)
 BuildRequires:  pugixml-devel
 %endif
 BuildRequires:  pkgconfig(python3) >= 3.5
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(xkbcommon)
+%endif
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  python3dist(numpy)
 BuildRequires:  python3dist(requests)
@@ -216,8 +219,9 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++14|' CMakeLis
     -DWITH_CODEC_FFMPEG=OFF \
 %endif
 %if %{with embree}
-    -D_embree_LIBRARIES=%{_libdir} \
-    -DWITH_CYCLES_EMBREE=%{cyclesflag} \
+    -DEMBREE_LIBRARY=%{_libdir} \
+    -DEMBREE_INCLUDE_DIR=%{_includedir} \
+    -DWITH_CYCLES_EMBREE=OFF \
 %endif
 %if %{with openshading}
     -DOSL_COMPILER=g++ \
@@ -238,6 +242,9 @@ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++14|' CMakeLis
     -DWITH_ALEMBIC=ON \
     -DWITH_CYCLES=%{cyclesflag} \
     -DWITH_DOC_MANPAGE=ON \
+%if %{with wayland}
+    -DWITH_GHOST_WAYLAND=ON \
+%endif
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_OPENSUBDIV=ON \
     -DWITH_OPENVDB=ON \
@@ -306,6 +313,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{_metainfodir}/%{name}-fonts.metainfo.xml
 
 %changelog
+* Mon Aug 31 2020 Luya Tshimbalanga <luya@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@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.
diff --git a/sources b/sources
index 10af7f4..0c25efa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.83.5.tar.xz) = 6179b4c285d40f59b7701cafe8d2cca5d764ef15b5c390c42cfb7cf8a41704b09a4e62fcf644d76bd2b7f47bcfc96395f0afa4a1d748c4c2ba8dfdee7356df9f
+SHA512 (blender-2.90.0.tar.xz) = 9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e