From 897a7eadc86eb82ffd5edff714f764ca5432ecdb Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Aug 06 2020 15:28:01 +0000
Subject: Update to 2.83.4 (#1855165)


---

diff --git a/.gitignore b/.gitignore
index 0cc9b7f..1dd098b 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,4 @@
 /blender-2.83.1.tar.xz
 /blender-2.83.2.tar.xz
 /blender-2.83.3.tar.xz
+/blender-2.83.4.tar.xz
diff --git a/blender.spec b/blender.spec
index a74dc1f..60bba88 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
@@ -31,8 +34,8 @@
 
 Name:       blender
 Epoch:      1
-Version:    %{blender_api}.3
-Release:    4%{?dist}
+Version:    %{blender_api}.4
+Release:    1%{?dist}
 
 Summary:    3D modeling, animation, rendering and post-production
 License:    GPLv2
@@ -55,7 +58,7 @@ Patch1:     %{name}-support-python-3.9.diff
 
 # Development stuff
 BuildRequires:  boost-devel
-BuildRequires:  cmake3
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -211,8 +214,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 
 %build
 
-%cmake3 . \
-    -B build \
+%cmake . \
 %ifnarch %{ix86} x86_64
     -DWITH_RAYOPTIMIZATION=OFF \
 %endif
@@ -222,45 +224,34 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
     -DCMAKE_SKIP_RPATH=ON \
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DPYTHON_VERSION=%{python3_version} \
-    -DPYTHON_INCLUDE_DIRS=%{_includedir} \
-    -DPYTHON_INCLUDE_CONFIG_DIR=%{_prefix} \
-    -DPYTHON_LIBPATH=%{python3_version} \
-    -DPYTHON_LIBRARY=%{_libdir}/%{python3_version} \
-    -DPYTHON_ROOT_DIR=%{_prefix} \
     %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \
     -DWITH_ALEMBIC=ON \
     -DWITH_OPENVDB=ON \
     -DWITH_OPENVDB_BLOSC=ON \
     -DWITH_CYCLES=%{cyclesflag} \
 %if %{with embree}
-        -DEMBREE_ROOT_DIR=%{_prefix} \
 	-DWITH_CYCLES_EMBREE=%{cyclesflag} \
 %endif
 %if %{with openshading}
         -DOSL_COMPILER=g++ \
-        -DOSL_ROOT_DIR=%{_prefix} \
-	-DWITH_CYCLES_OSL=%{cyclesflag} \
 %endif
 %if %{with opensubdiv}
 	-DWITH_OPENSUBDIV=ON \
 %endif
 %if %{with oidn}
 	-DWITH_OPENIMAGEDENOISE=ON \
-	-DOPENIMAGEDENOISE_LIBRARY=%{_libdir} \
-    	-DOPENIMAGEDENOISE_INCLUDE_DIR=%{_includedir} \
 %endif   
     -DWITH_DOC_MANPAGE=ON \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_PYTHON=ON \
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_PYTHON_INSTALL_REQUESTS=OFF \
-    -DWITH_PYTHON_SAFETY=ON \
-    -DWITH_SYSTEM_GLOG=OFF
-%make_build -C build
+    -DWITH_PYTHON_SAFETY=ON 
+%cmake_build 
 
 
 %install
-%make_install -C build
+%cmake_install 
 
 
 # Thumbnailer
@@ -320,6 +311,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
 %{_metainfodir}/%{name}-fonts.metainfo.xml
 
 %changelog
+* Wed Aug 05 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.4-1
+- Update to 2.83.4 (#1855165)
+
+
 * Sat Aug 01 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.83.3-4
 - Use cmake macros for build and install 
 
diff --git a/sources b/sources
index 3617d37..0be1187 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (blender-2.83.3.tar.xz) = 20d284dc83bbd16ae126915a62c64a3f0860d61f66387c5fee1c549cb9002834c934b509ca3ea8475c1e7b6c683feb61862ab0e0a246808d10a632488748772f
+SHA512 (blender-2.83.4.tar.xz) = 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5