<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de9c29082ff0364c17e8df4d94ee47d95b1e4035">https://github.com/macports/macports-ports/commit/de9c29082ff0364c17e8df4d94ee47d95b1e4035</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new de9c29082ff blender: update to 2.90.0
</span>de9c29082ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit de9c29082ff0364c17e8df4d94ee47d95b1e4035
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Tue Feb 23 22:07:28 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> blender: update to 2.90.0
</span>---
graphics/blender/Portfile | 101 +++++++++++----------
.../blender/files/patch-macports-libs-creator.diff | 23 +++--
.../files/patch-macports-libs-platform_apple.diff | 77 +++++++++++-----
.../blender/files/patch-manpage-for-apple.diff | 6 +-
graphics/blender/files/patch-unix-or-apple.diff | 18 ++--
5 files changed, 136 insertions(+), 89 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/Portfile b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de3e1b07b36..3292bec23ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup active_variants 1.1
name blender
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.83.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.90.0
</span> categories graphics multimedia
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ long_description Blender is a ${description}. It contains a set of \
</span>
master_sites https://download.blender.org/source/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 52957a68afd8e8c019fc0c1499ec2cb26bfd0b79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 835ca58f4ff12f21f43ea77ddbabd80cba320952fb2cb39a83a928003ce5ca77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38551588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 747c96c2453d8203c7df6d80ef246e4834d43984 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 04f19e7984ad8d9f0432f873db89664eb710e75ac4d4c2b1a404e2ecdadb1323 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38831704
</span>
minimum_xcodeversions-append {15 8.2 16 8.2}
if {${os.platform} eq "darwin" && ${os.major} < 15} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +85,7 @@ depends_lib-append port:python${py_ver_nodot} \
</span> port:tbb \
port:libomp \
port:glew \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3 \
</span> port:lzo2 \
port:gflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,13 +102,19 @@ patchfiles patch-macports-libs-creator.diff \
</span> patch-unix-or-apple.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't really know why Blender does things this way, but if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these directories don't exist ahead of time, MacPorts'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure phase will fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/lib/tests/render/shader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/build/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/release/darwin/Blender.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platform_apple.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build_files/cmake/platform/platform_apple.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platform_apple_xcode.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build_files/cmake/platform/platform_apple_xcode.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s/(MACOSX_DEPLOYMENT_TARGET) 10.13/\1 10.11/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${platform_apple.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/VERSION_LESS 10.0/,/FATAL_ERROR/s/10.0/8.2/g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${platform_apple_xcode.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s/(OSX_MIN_DEPLOYMENT_TARGET) 10.13/\1 10.11/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${platform_apple_xcode.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# Make it so that Blender is able to build Ceres Solver using the
# MacPorts eigen3 library.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,16 +129,11 @@ post-patch {
</span> # add_definitions() in the file 'extern/ceres/CMakeLists.txt', it's
# possible that Blender's own libmv library requires a Ceres Solver
# that has been compiled using a very specific set of options.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The eigen3 port was recently updated to version 3.3.8, which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# incompatible with the version of Ceres Solver that is included with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blender 2.83. Temporarily disable using the eigen3 port until the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blender port catches up to using a compatible combination of Ceres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Solver and eigen3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fs-traverse f ${worksrcpath}/extern/ceres {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[file isfile $f]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace -q -E {s|(#include )"(Eigen/.*)"|\1<\2>|} $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath}/extern/ceres {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile $f]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q -E {s|(#include )"(Eigen/.*)"|\1<\2>|} $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# Use dynamic linking instead of static linking
foreach f [list \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,12 +150,13 @@ post-patch {
</span> ${worksrcpath}/extern/sdlew/src/sdlew.c
reinplace -E {s|(include )"(SDL.h)"|\1<SDL2/\2>|} \
${worksrcpath}/source/blender/python/intern/bpy_app_sdl.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(include )"(openjpeg.h)"|\1<openjpeg-2.3/\2>|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|(include )"(openjpeg.h)"|\1<openjpeg-2.4/\2>|} \
</span> ${worksrcpath}/source/blender/imbuf/intern/jp2.c
# Make it so that CMake is able to find the MacPorts USD library
if {![catch {set result [active_variants usd monolithic]}] && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- !$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !$result} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> # When Blender is configured to build USD as an internal
# dependency, Blender sets USD's compile options so that it
# builds as a single monolithic library. However, the default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,15 +174,16 @@ list(APPEND USD_LIBRARIES\\
</span> " \
${worksrcpath}/source/blender/io/usd/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [list \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/source/blender/io/usd/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tests/gtests/usd/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/add_definitions.*DPXR_STATIC/s/^/#/g} $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/add_definitions.*DPXR_STATIC/s/^/#/g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/source/blender/io/usd/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/BOOST_INCLUDE_DIR/a\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ \\$\\{PYTHON_INCLUDE_DIRS\\}\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/source/blender/io/usd/CMakeLists.txt
</span>
if {![catch {set result [active_variants embree static]}] && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- !$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !$result} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> # Remove these items from the list of Embree components that
# Blender's FindEmbree.cmake script will try to find. The
# default variant of the MacPorts Embree port does not generate
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,21 +203,15 @@ list(APPEND USD_LIBRARIES\\
</span> # We already patch 'llvm-config' to be 'llvm-config-mp' using our
# patchfiles. Here we are just adding a version number on the end.
foreach re [list \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@py_ver@@|$py_ver|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@py_ver_nodot@@|$py_ver_nodot|" \
</span> "s|\(llvm-config-mp\)|\\1-$llvm_version|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\(-lLLVM-\).*\"|\\1$llvm_version\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {s|(-lLLVM)-.*\"|\1\"|} \
</span> ] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E $re \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build_files/cmake/platform/platform_apple.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E $re ${platform_apple.cmake}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set platform_apple_xcode.cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build_files/cmake/platform/platform_apple_xcode.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent Blender's CMake scripts from attempting to find the Xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version number using the xcodebuild command, since we are passing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the Xcode version number to CMake using XCODE_VERSION below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/unix makefile/,/unset.XCODE_VERS_BUILD_NR/s/^/#/g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${platform_apple_xcode.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/@@llvm_version@@/$llvm_version/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/source/creator/CMakeLists.txt
</span>
# Prevent Blender's CMake scripts from attempting to set the
# MACOSX_DEPLOYMENT_TARGET. MacPorts base already sets this.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,7 +244,7 @@ list(APPEND USD_LIBRARIES\\
</span> # version in Xcode.app. Using one set of tools or the other for
# the entirety of a build is fine, but trying to use pieces from
# both will virtually guarantee a build to fail.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/set.CMAKE_OSX_SYSROOT.*OSX_SYSROOT_PREFIX/s/^/#/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/set.CMAKE_OSX_SYSROOT /s/^/#/} \
</span> ${platform_apple_xcode.cmake}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,13 +289,22 @@ configure.args-append -DWITH_SDL_DYNLOAD=ON
</span>
# Tell Blender to use these "system" (in our case, MacPorts) libraries
configure.args-append -DWITH_SYSTEM_GLEW=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SYSTEM_EIGEN3=ON \
</span> -DWITH_SYSTEM_LZO=ON \
-DWITH_SYSTEM_GFLAGS=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Temporarily disable using MacPorts eigen3 port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -DWITH_SYSTEM_EIGEN3=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Build Cycles with Embree support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DWITH_CYCLES_EMBREE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: There's currently a linking error when building Cycles with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OSL support, so we need to disable it until a fix can be found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# XXX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_CYCLES_OSL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# By default, Blender prefers static llvm build on Apple, but they state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that dynamic builds are also possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_STATIC=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/libexec/llvm-${llvm_version}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath-append ${prefix}/libexec/llvm-${llvm_version}/lib
</span>
post-destroot {
# Make sure that an addons_contrib folder makes it into the final
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/files/patch-macports-libs-creator.diff b/graphics/blender/files/patch-macports-libs-creator.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index af749bf2779..d8639b5b6a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/files/patch-macports-libs-creator.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/files/patch-macports-libs-creator.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/creator/CMakeLists.txt.orig 2020-09-03 10:32:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2020-09-03 10:33:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2020-08-31 08:03:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2021-02-13 14:13:30.000000000 -0500
</span> @@ -76,9 +76,28 @@
if(WITH_TBB)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,20 +30,29 @@
</span>
if(WITH_PYTHON)
blender_include_dirs(../blender/python)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -949,14 +968,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -980,15 +999,21 @@
</span>
if(WITH_OPENMP AND OPENMP_CUSTOM)
install(
- FILES ${LIBDIR}/openmp/lib/libomp.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FILES ${LIBDIR}/lib/libomp/libomp.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION Blender.app/Contents/Resources/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION Blender.app/Contents/Resources/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CODE "execute_process( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${CMAKE_COMMAND} -E create_symlink \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIBDIR}/lib/libomp/libomp.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_BINARY_DIR}/bin/Blender.app/Contents/Resources/lib/libomp.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )"
</span> )
endif()
if(WITH_LLVM AND NOT LLVM_STATIC)
install(
- FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FILES ${LIBDIR}/libexec/llvm-3.7/lib/libLLVM-3.7.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION Blender.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION Blender.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CODE "execute_process( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${CMAKE_COMMAND} -E create_symlink \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIBDIR}/libexec/llvm-@@llvm_version@@/lib/libLLVM.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_BINARY_DIR}/bin/Blender.app/Contents/MacOS/libLLVM.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )"
</span> )
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/files/patch-macports-libs-platform_apple.diff b/graphics/blender/files/patch-macports-libs-platform_apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 14c89311ac7..8329b94f5db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/files/patch-macports-libs-platform_apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/files/patch-macports-libs-platform_apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_files/cmake/platform/platform_apple.cmake.orig 2020-09-03 10:10:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_files/cmake/platform/platform_apple.cmake 2020-09-03 11:09:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build_files/cmake/platform/platform_apple.cmake.orig 2020-08-31 08:03:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build_files/cmake/platform/platform_apple.cmake 2021-03-02 16:51:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,10 @@
</span> message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> if(WITH_OPENAL)
find_package(OpenAL)
if(OPENAL_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +56,7 @@
</span> endif()
if(WITH_ALEMBIC)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +72,7 @@
</span> endif()
if(WITH_OPENSUBDIV)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,38 +79,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,38 +83,38 @@
</span>
if(WITH_JACK)
find_library(JACK_FRAMEWORK
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@
</span> if(WITH_PYTHON)
# we use precompiled libraries for py 3.7 and up by default
- set(PYTHON_VERSION 3.7)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_VERSION 3.8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PYTHON_VERSION @@py_ver@@)
</span> if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with blender
- set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@
</span> # set(PYTHON_LIBRARY python${PYTHON_VERSION})
# set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,26 +130,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,26 +134,40 @@
</span> endif()
if(WITH_FFTW3)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@
</span> set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBRARIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +176,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +180,7 @@
</span> endif()
if(WITH_CODEC_FFMPEG)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,7 @@
</span> set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES
avcodec avdevice avformat avutil
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,9 +189,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,9 +193,9 @@
</span>
if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG)
# use openjpeg from libdir that is linked into ffmpeg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@
</span> endif()
find_library(SYSTEMSTUBS_LIBRARY
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,28 +212,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,28 +216,29 @@
</span> list(APPEND PLATFORM_LINKLIBS c++)
if(WITH_JACK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,7 +185,7 @@
</span> -lOpenCOLLADAFramework
-lOpenCOLLADABaseUtils
-lOpenCOLLADAStreamWriter
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,32 +248,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -233,32 +252,32 @@
</span> endif()
if(WITH_SDL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,7 +224,17 @@
</span> set(BOOST_LIBRARIES
boost_date_time${BOOST_POSTFIX}
boost_filesystem${BOOST_POSTFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -281,10 +300,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,6 +286,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_thread${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_wave${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(WITH_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND BOOST_LIBRARIES boost_python@@py_ver_nodot@@${BOOST_POSTFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_INTERNATIONAL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND BOOST_LIBRARIES boost_locale${BOOST_POSTFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -285,10 +307,10 @@
</span> endif()
if(WITH_OPENIMAGEIO)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,7 +247,7 @@
</span> ${PNG_LIBRARIES}
${JPEG_LIBRARIES}
${TIFF_LIBRARY}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,29 +319,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,29 +326,29 @@
</span> ${OPENEXR_LIBPATH}
${ZLIB_LIBPATH}
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,21 +285,42 @@
</span> else()
set(LLVM_CONFIG llvm-config)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,7 +379,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,20 +386,12 @@
</span> endif()
if(WITH_CYCLES_OSL)
- set(CYCLES_OSL ${LIBDIR}/osl)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # WARNING! depends on correct order of OSL libs linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(OSL_SHADER_DIR NAMES stdosl.h PATHS ${CYCLES_OSL}/shaders)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER AND OSL_SHADER_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OSL_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span> + set(CYCLES_OSL ${LIBDIR})
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT OSL_ROOT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(OSL_ROOT ${CYCLES_OSL})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(OpenShadingLanguage)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT OSL_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "OSL not found")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WITH_CYCLES_OSL OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,23 +423,23 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -400,21 +419,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
</span> if(WITH_OPENMP)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
</span> # Use OpenMP from our precompiled libraries.
- message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using ${LIBDIR} for OpenMP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using ${LIBDIR}/lib/libomp for OpenMP")
</span> set(OPENMP_CUSTOM ON)
set(OPENMP_FOUND ON)
- set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,18 +328,18 @@
</span> - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/openmp/lib' -lomp")
+ set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/include/libomp'")
+ set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/include/libomp'")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/lib' -lomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/lib/libomp' -lomp")
</span>
# Copy libomp.dylib to allow executables like datatoc and tests to work.
execute_process(
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND cp -p ${LIBDIR}/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ln -s ${LIBDIR}/lib/libomp/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
</span> )
execute_process(
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND cp -p ${LIBDIR}/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ln -s ${LIBDIR}/lib/libomp/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
</span> )
endif()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/files/patch-manpage-for-apple.diff b/graphics/blender/files/patch-manpage-for-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 46dfcd1096d..89a76a04146 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/files/patch-manpage-for-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/files/patch-manpage-for-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/creator/CMakeLists.txt.orig 2020-09-03 10:33:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2020-09-03 10:47:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -893,6 +893,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2021-02-13 12:39:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2021-02-13 13:02:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -924,6 +924,21 @@
</span> if(NOT WITH_PYTHON_MODULE)
# Uppercase name for app bundle
set_target_properties(blender PROPERTIES OUTPUT_NAME Blender)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/files/patch-unix-or-apple.diff b/graphics/blender/files/patch-unix-or-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 830e5309f17..fd7eb8d71fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/files/patch-unix-or-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/files/patch-unix-or-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2020-09-03 10:37:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-09-03 10:37:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,7 +227,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-08-31 08:03:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2021-02-13 12:44:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +230,7 @@
</span> endif()
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> option(WITH_OPENMP_STATIC "Link OpenMP statically (only used by the release environment)" OFF)
mark_as_advanced(WITH_OPENMP_STATIC)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,7 +242,7 @@
</span> option(WITH_X11_ALPHA "Enable X11 transparent background" ON)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" OFF)
option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating system" ON)
else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -249,7 +249,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,7 @@
</span> endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,18 +289,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,18 +291,18 @@
</span> option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
if(NOT WIN32)
option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> option(WITH_SYSTEM_LZO "Use the system LZO library" OFF)
endif()
option(WITH_DRACO "Enable Draco mesh compression Python module (used for glTF)" ON)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,7 +328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,7 +326,7 @@
</span> option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
endif()
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +58,8 @@
</span> option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
if(WITH_STATIC_LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -431,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -440,7 +440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(TEST_PYTHON_EXE)
</span>
# Documentation
-if(UNIX AND NOT APPLE)
</pre><pre style='margin:0'>
</pre>