From 236eafb2b08d51f25256f2d233ee989aef1e33e5 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Mar 21 2018 04:59:53 +0000
Subject: Update to 2.79a

Add gcc-c++
Temporarily disable openvdb due failure to build
Upstream patch for compile fix with GCC 8.0

---

diff --git a/.gitignore b/.gitignore
index 4b7d4db..51356d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@
 /blender-2.78c.tar.gz
 /blender-2.79.tar.gz
 /blender-2.79a.tar.gz
+/util_sseb.patch
+/tree_hpp.patch
diff --git a/blender.spec b/blender.spec
index 09a2695..2fcf581 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.79
+%global blender_api 2.79a
 
 # 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')
@@ -17,7 +17,7 @@
 
 Name:       blender
 Epoch:      1
-Version:    %{blender_api}a
+Version:    %{blender_api}
 Release:    1%{?dist}
 
 Summary:    3D modeling, animation, rendering and post-production
@@ -41,12 +41,15 @@ Patch6:     %{name}-2.79-openvdb3-abi.patch
 # https://lists.blender.org/pipermail/bf-blender-cvs/2016-July/088691.html
 # but without patch-updating the bundled openjpeg2 version
 Patch7:     blender-2.79-openjpeg2.patch
+Patch8:     util_sseb.patch
+Patch9:	    tree_hpp.patch
 
 # Development stuff
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel
+BuildRequires:	gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git
 BuildRequires:  jemalloc-devel
@@ -93,7 +96,7 @@ BuildRequires:  OpenColorIO-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  OpenImageIO-devel
 BuildRequires:  openjpeg2-devel
-BuildRequires:  openvdb-devel
+#BuildRequires:  openvdb-devel
 BuildRequires:  tbb-devel
 
 # Audio stuff
@@ -197,8 +200,8 @@ export CXXFLAGS="$CXXFLAGS -mno-altivec"
     -DWITH_MOD_OCEANSIM=ON \
     -DWITH_OPENCOLLADA=ON \
     -DWITH_OPENCOLORIO=ON \
-    -DWITH_OPENVDB=ON \
-    -DWITH_OPENVDB_BLOSC=ON \
+    -DWITH_OPENVDB=OFF \
+    -DWITH_OPENVDB_BLOSC=OFF \
     -DWITH_PLAYER=ON \
     -DWITH_PYTHON=ON \
     -DWITH_PYTHON_INSTALL=OFF \
@@ -298,6 +301,9 @@ fi
 %changelog
 * Wed Feb 28 2018 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.79a-1
 - Update to 2.79a
+- Add gcc-c++
+- Temporarily disable openvdb due failure to build
+- Upstream patch for compile fix with GCC 8.0
 
 * Mon Feb 26 2018 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.79-8
 - Rebuild for boost 1.66
diff --git a/sources b/sources
index 87c36f3..75db16c 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (blender-2.79a.tar.gz) = d127ac30efed138d75abd5fd4f13e29834c5bbc1ca5b8ea3b37c0595eaa8a13da3d0d60f52ee1e442cec7b0d14ee950ad9649a76cf80004e5a2df65105259789
+SHA512 (util_sseb.patch) = 429ffb6d36efb04c02d506858fc2691ea927ca486d950313dcb0c94d535a66409a14863807e69adc657dafbe243d0aad15cfaadf9f27bdc7c7759211da3fb8a8
+SHA512 (tree_hpp.patch) = 6c0a619fe8fbc215a9a7c9d4b9c6fc5ec355c37212ec41b05b50787465354bbc7200e76eaafba46a2253196391838190d3de3b2be132095d2162142940e87924