From e677f8f358f781451e88f1538a1b63b5792ada08 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Aug 25 2020 14:46:25 +0000 Subject: Use c++14 for properly building with the latest version of openvdb --- diff --git a/blender.spec b/blender.spec index bc47d72..c2fcc29 100644 --- a/blender.spec +++ b/blender.spec @@ -28,7 +28,7 @@ Name: blender Epoch: 1 Version: %{blender_api}.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -45,9 +45,7 @@ Patch0: %{name}-%{blender_api}-droid.patch # Upstream fix to support Python 3.9 # https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f -%if 0%{?fedora} >= 33 Patch1: %{name}-support-python-3.9.diff -%endif # Development stuff BuildRequires: boost-devel @@ -203,6 +201,11 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . +# Use c++14 in order to fix build errors when including headers +# from the latest version of openvdb. +# Upstream issue: https://github.com/AcademySoftwareFoundation/openvdb/issues/795 +sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++14|' CMakeLists.txt + %build %cmake . \ %ifnarch %{ix86} x86_64 @@ -306,6 +309,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml %changelog +* Tue Aug 25 2020 Charalampos Stratakis - 1:2.83.5-3 +- Use c++14 for properly building with the latest version of openvdb + * Mon Aug 24 2020 Simone Caronni - 1:2.83.5-2 - Be consistent with build options format and distribution conditionals. - rpmlint fixes.