diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 13:32:55 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 13:33:15 +0100 |
| commit | 4f0c93f505f5c48ad580f6a926a0f226de215171 (patch) | |
| tree | a42001a7a8547386d331b453b6c2a4b00b39f355 /media-gfx/blender | |
| parent | dev-util/dialog: Version 1.3.20191110 (diff) | |
| download | gentoo-4f0c93f505f5c48ad580f6a926a0f226de215171.tar.gz gentoo-4f0c93f505f5c48ad580f6a926a0f226de215171.tar.bz2 gentoo-4f0c93f505f5c48ad580f6a926a0f226de215171.zip | |
media-gfx/blender-2.79b: fix #685922
Closes: https://bugs.gentoo.org/685922
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/blender-2.79b-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch | 31 |
2 files changed, 33 insertions, 0 deletions
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild index 147bcd56b0d9..a84c696b9b17 100644 --- a/media-gfx/blender/blender-2.79b-r1.ebuild +++ b/media-gfx/blender/blender-2.79b-r1.ebuild @@ -24,6 +24,7 @@ IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \ cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ osl player sdl sndfile test tiff valgrind" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} cuda? ( cycles ) @@ -98,6 +99,7 @@ PATCHES=( "${FILESDIR}/${PN}-fix-install-rules.patch" "${FILESDIR}/${P}-gcc-8.patch" "${FILESDIR}/${P}-ffmpeg-4-compat.patch" + "${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch" ) blender_check_requirements() { diff --git a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch new file mode 100644 index 000000000000..0ecc960d28e1 --- /dev/null +++ b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch @@ -0,0 +1,31 @@ +diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp +index 68f7c04..514087b 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, \ |