[PR PATCH] blender: fix build with gcc9

[PR PATCH] blender: fix build with gcc9

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages blender
https://github.com/void-linux/void-packages/pull/14671

blender: fix build with gcc9


A patch file from https://github.com/void-linux/void-packages/pull/14671.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-14671.patch --]
[-- Type: text/x-diff, Size: 1967 bytes --]

From 19856adb6c2a8e0f0d7493bd160a98d06755fd28 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 23 Sep 2019 21:17:24 +0200
Subject: [PATCH] blender: fix build with gcc9

[ci skip]
---
 srcpkgs/blender/patches/gcc9-elbeem.patch | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/blender/patches/gcc9-elbeem.patch

diff --git a/srcpkgs/blender/patches/gcc9-elbeem.patch b/srcpkgs/blender/patches/gcc9-elbeem.patch
new file mode 100644
index 00000000000..26c58e7d988
--- /dev/null
+++ b/srcpkgs/blender/patches/gcc9-elbeem.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/685922
+
+--- 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 default(none) firstprivate(gDebugLevel,iend,lev,cutConst) 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 default(none) firstprivate(gDebugLevel,iend,lev) 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 default(none) firstprivate(gDebugLevel,iend,lev) num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \

Re: [PR PATCH] [Merged]: blender: fix build with gcc9

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a merged pull request on the void-packages repository

blender: fix build with gcc9
https://github.com/void-linux/void-packages/pull/14671

Description: