Hello community,
here is the log from the commit of package blender for openSUSE:Factory checked
in at 2019-07-16 08:40:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blender (Old)
and /work/SRC/openSUSE:Factory/.blender.new.1887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender"
Tue Jul 16 08:40:46 2019 rev:115 rq:715001 version:2.79b
Changes:
--------
--- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-06-01
09:58:23.503134942 +0200
+++ /work/SRC/openSUSE:Factory/.blender.new.1887/blender.changes
2019-07-16 08:40:59.095029430 +0200
@@ -1,0 +2,7 @@
+Sat Jul 13 11:24:44 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Fix building with GCC9, add
+ 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch
+- Switch back to GCC, to fix issues with LTO now enabled in Tumbleweed
+
+-------------------------------------------------------------------
New:
----
0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.E5yMos/_old 2019-07-16 08:41:00.103029766 +0200
+++ /var/tmp/diff_new_pack.E5yMos/_new 2019-07-16 08:41:00.107029768 +0200
@@ -54,17 +54,19 @@
Patch3: 0001-Fix-PyRNA-class-registration-w-Python-3.7.patch
# PATCH-FIX-UPSTREAM 0008-fix_building_with_latest_versions_of_FFmpeg.patch --
Fix build with current ffmpeg v4
Patch4: 0008-fix_building_with_latest_versions_of_FFmpeg.patch
+# PATCH-FIX-UPSTREAM 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch -- Fix
build with GCC 9
+Patch5: 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch
# libquicktime-devel
#!BuildIgnore: libGLwM1
BuildRequires: OpenEXR-devel
BuildRequires: SDL2-devel
BuildRequires: binutils-gold
-BuildRequires: clang
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: distribution-release
BuildRequires: fdupes
BuildRequires: fftw3-devel
+BuildRequires: gcc-c++
BuildRequires: gettext-tools
BuildRequires: graphviz
BuildRequires: help2man
@@ -198,9 +200,6 @@
for i in `grep -rl "/usr/bin/env python3"`;do sed -i
'1s@^#!.*@#!/usr/bin/python3@' ${i} ;done
%build
-export CC=/usr/bin/clang
-export CXX=/usr/bin/clang++
-
# sse options only on supported archs
%ifarch %{ix86} x86_64
sseflags='-msse -msse2'
++++++ 0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch ++++++
>From d780409156e838e366f4da5126e6aeab44174d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebo...@gmail.com>
Date: Wed, 3 Apr 2019 01:36:52 +0200
Subject: [PATCH] Fix for GCC9 new OpenMP data sharing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
GCC 9 started implementing the OpenMP 4.0 and later behavior. When not using
default clause or when using default(shared), this makes no difference, but
if using default(none), previously the choice was not specify the const
qualified variables on the construct at all, or specify in firstprivate
clause. In GCC 9 as well as for OpenMP 4.0 compliance, those variables need
to be specified on constructs in which they are used, either in shared or
in firstprivate clause. Specifying them in firstprivate clause is one way to
achieve compatibility with both older GCC versions and GCC 9,
another option is to drop the default(none) clause.
This patch thus drops the default(none) clause.
See https://gcc.gnu.org/gcc-9/porting_to.html#ompdatasharing
Signed-off-by: Robert-André Mauchin <zebo...@gmail.com>
---
intern/elbeem/intern/solver_main.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/intern/elbeem/intern/solver_main.cpp
b/intern/elbeem/intern/solver_main.cpp
index 68f7c04cd54..514087b6130 100644
--- a/intern/elbeem/intern/solver_main.cpp
+++ b/intern/elbeem/intern/solver_main.cpp
@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
GRID_REGION_INIT();
#if PARALLEL==1
const int gDebugLevel = ::gDebugLevel;
-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
+#pragma omp parallel num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
calcCellsFilled,calcCellsEmptied, \
@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
GRID_REGION_INIT();
#if PARALLEL==1
const int gDebugLevel = ::gDebugLevel;
-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
+#pragma omp parallel num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
calcCellsFilled,calcCellsEmptied, \
@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
GRID_REGION_INIT();
#if PARALLEL==1
const int gDebugLevel = ::gDebugLevel;
-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
+#pragma omp parallel num_threads(mNumOMPThreads) \
reduction(+: \
calcCurrentMass,calcCurrentVolume, \
calcCellsFilled,calcCellsEmptied, \
