<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f2264829045b35468fdb443d035a328d1b25ddb9">https://github.com/macports/macports-ports/commit/f2264829045b35468fdb443d035a328d1b25ddb9</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 f2264829045 blender: update to version 2.91.0
</span>f2264829045 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f2264829045b35468fdb443d035a328d1b25ddb9
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Thu Apr 1 13:55:35 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> blender: update to version 2.91.0
</span>---
graphics/blender/Portfile | 103 ++++--
.../blender/files/patch-macports-libs-creator.diff | 14 +-
.../files/patch-macports-libs-platform_apple.diff | 356 ++++++++-------------
.../blender/files/patch-manpage-for-apple.diff | 8 +-
graphics/blender/files/patch-unix-or-apple.diff | 16 +-
5 files changed, 213 insertions(+), 284 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 8bb4c441fc7..fd0f9073e40 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.90.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.91.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 63e2f9de4d48e0d0fac12d1fbc12313dc3d2c750 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38836408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 536d839a3b054bc6f25c4b160adfc2e12bde27f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 557a4afd09fe086ebcb0256b904896f577fe913683655f4248b881591f356974 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41528920
</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;'>@@ -39,13 +39,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span> # We need to blacklist Xcode Clang/LLVM, because Blender needs to
# use tools such as llvm-config, which are not included in Xcode.
# (llvm-config is needed because Blender links to libLLVM. libLLVM is
# also not included in Xcode.)
# (Reference: https://stackoverflow.com/questions/32959627/where-is-the-system-llvm-config-on-macos)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist clang {macports-clang-[5-8].0}
</span> # Even though we need to blacklist Xcode Clang/LLVM, we still need to
# make the rest of Xcode available to the build system. If we don't set
# use_xcode to yes, then the build will fail, because Blender's CMake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,9 @@ depends_lib-append port:python${py_ver_nodot} \
</span> port:embree \
port:oidn \
port:tbb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:potrace \
</span> port:libomp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span> port:glew \
port:eigen3 \
port:lzo2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +116,46 @@ post-patch {
</span> ${platform_apple_xcode.cmake}
reinplace -E {s/(OSX_MIN_DEPLOYMENT_TARGET) 10.13/\1 10.11/} \
${platform_apple_xcode.cmake}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Starting in Blender 2.90, the devs moved to using C++17 to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compile Cycles. However, on older versions of macOS, this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # causes the build to fail with the error 'Undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # symbols for architecture x86_64: "operator delete(void*,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # std::align_val_t)", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ccl::OSLRenderServices::~OSLRenderServices() in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcycles_kernel_osl.a(osl_services.cpp.o)'. The first few
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # references below seemed to point towards something related to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needing to disable -falign-new by using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DCOMPILER_HAS_F_ALIGNED_NEW=OFF, but it turns out that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error is actually being caused by the fact that the devs are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # adding -faligned-allocation in the file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'intern/cycles/kernel/osl/CMakeLists.txt'. It seems that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # real problem is that Clang on older macOSes do not have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # aligned allocation when compiling using C++17. Thus, we need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use -fno-aligned-allocation. However, we also cannot simply
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the section of code from 'CMakeLists.txt' that adds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -faligned-allocation, because if we do, the build will fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with the warning/error: "aligned deallocation function of type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'void (void *, std::align_val_t) noexcept' is only available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on macOS 10.14 or newer"; "note: if you supply your own
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # aligned allocation functions, use -faligned-allocation to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # silence this diagnostic". Thus, in order to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # successfully, we need to explicitly use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -fno-aligned-allocation on older macOSes, and explicitly use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -faligned-allocation on newer macOSes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # References:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://github.com/facebook/folly/issues/864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://www.veripool.org/issues/1231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://trac.macports.org/ticket/47191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://bugs.llvm.org/show_bug.cgi?id=22951
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://stackoverflow.com/questions/31686508/why-is-delete-operator-required-for-virtual-destructors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://bugs.freedesktop.org/show_bug.cgi?id=54948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://github.com/pybind/python_example/issues/48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://github.com/llvm-mirror/clang/blob/master/test/SemaCXX/unavailable_aligned_allocation.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * See also the Portfile for port:folly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s/(-f)(aligned-allocation)/\1no-\2/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/intern/cycles/kernel/osl/CMakeLists.txt
</span> }
# Make it so that Blender is able to build Ceres Solver using the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,15 +185,13 @@ post-patch {
</span> reinplace "/_STATIC_/s/^/#/g" $f
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make it so that Blender is able to see the MacPorts libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(include <SD)L.h|\1L2/SDL.h|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extern/audaspace/plugins/sdl/SDLDevice.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(include )"(SDL2.*)"|\1<\2>|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/extern/sdlew/src/sdlew.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(include )"(SDL.h)"|\1<SDL2/\2>|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/source/blender/python/intern/bpy_app_sdl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(include )"(openjpeg.h)"|\1<openjpeg-2.4/\2>|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/source/blender/imbuf/intern/jp2.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Inexplicably, BOOST_LIBPATH is being set in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # platform_unix.cmake script, but not in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # platform_apple.cmake script. So we need to add it ourselves.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/set.BOOST_DEFINITIONS/i\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(BOOST_LIBPATH \\$\\{Boost_LIBRARY_DIRS\\})\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${platform_apple.cmake}
</span>
# 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:#e0e0e0;'>@@ -203,18 +243,23 @@ list(APPEND USD_LIBRARIES\\
</span> ${platform_apple.cmake}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # We already patch 'llvm-config' to be 'llvm-config-mp' using our
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles. Here we are just adding a version number on the end.
</span> foreach re [list \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|@@py_ver@@|$py_ver|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|@@py_ver_nodot@@|$py_ver_nodot|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\(llvm-config-mp\)|\\1-$llvm_version|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {s|(-lLLVM)-.*\"|\1\"|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s/@@py_ver@@/$py_ver/g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s/@@py_ver_nodot@@/$py_ver_nodot/g" \
</span> ] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E $re ${platform_apple.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace $re ${platform_apple.cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$py_ver > 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s/(PYTHON_VERSION.)m/\1/} ${platform_apple.cmake}
</span> }
reinplace "s/@@llvm_version@@/$llvm_version/g" \
${worksrcpath}/source/creator/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s/(llvm-config-)/\1mp-/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build_files/cmake/Modules/FindLLVM.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|(llvm-config HINTS.*)bin|\1libexec/llvm-$\{LLVM_VERSION\}/bin|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build_files/cmake/Modules/FindLLVM.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "/find_program.LLVM_CONFIG llvm-config.$/s|(llvm-config)|\\1 HINTS ${prefix}/libexec/llvm-\${LLVM_VERSION}/bin|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/build_files/cmake/Modules/FindLLVM.cmake
</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;'>@@ -265,7 +310,8 @@ if {${os.major} < 16} {
</span> # vvvvvv
configure.args-append -DLIBDIR=${prefix} \
-DFRAMEWORK_SEARCH_PATHS=${frameworks_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DXCODE_VERSION=${xcodeversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DXCODE_VERSION=${xcodeversion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_VERSION=$llvm_version
</span>
# Tell CMake to generate more verbose output during the build
configure.args-append -DCMAKE_VERBOSE_MAKEFILE=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,18 +342,9 @@ configure.args-append -DWITH_SYSTEM_GLEW=ON \
</span> -DWITH_SYSTEM_LZO=ON \
-DWITH_SYSTEM_GFLAGS=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: There's currently a linking error when building Cycles with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OSL support, so we need to disable it until a fix can be found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# XXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_CYCLES_OSL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # By default, Blender prefers static llvm build on Apple, but they state
# that dynamic builds are also possible
configure.args-append -DLLVM_STATIC=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/libexec/llvm-${llvm_version}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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;background:#e0e0e0;'>@@ -335,7 +372,7 @@ variant manpage description {Build manpage} {
</span> patchfiles-append patch-manpage-for-apple.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@prefix@@|${prefix}|" \
</span> ${worksrcpath}/source/creator/CMakeLists.txt
reinplace -E "s/\(env python\)3/\\1${py_ver}/" \
${worksrcpath}/doc/manpage/blender.1.py
<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 d8639b5b6a4..6f8767d78c7 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,11 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/creator/CMakeLists.txt.orig 2020-08-31 08:03:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2021-02-13 14:13:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,9 +76,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_TBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blender_include_dirs(${TBB_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- link_directories(${LIBDIR}/tbb/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_directories(${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2020-11-25 03:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2021-03-16 01:45:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,6 +79,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> endif()
+if(WITH_LZO)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +26,7 @@
</span>
if(WITH_PYTHON)
blender_include_dirs(../blender/python)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -980,15 +999,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -988,15 +1007,21 @@
</span>
if(WITH_OPENMP AND OPENMP_CUSTOM)
install(
<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 cd179c4ec21..5188e0c8eda 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,56 +1,58 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_files/cmake/platform/platform_apple.cmake.orig 2020-09-23 03:27:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_files/cmake/platform/platform_apple.cmake 2021-03-07 12:17:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +42,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build_files/cmake/platform/platform_apple.cmake.orig 2020-11-25 03:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build_files/cmake/platform/platform_apple.cmake 2021-03-15 03:01:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,8 +47,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find system provided libraries.
</span>
+if(NOT DEFINED FRAMEWORK_SEARCH_PATHS)
+ set(FRAMEWORK_SEARCH_PATHS /Library/Frameworks)
+endif()
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_OPENAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(OpenAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(OPENAL_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find system ZLIB, not the pre-compiled one supplied with OpenCollada.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(ZLIB_ROOT /usr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(ZLIB_ROOT ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(ZLIB REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(BZip2 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT JACK_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WITH_JACK OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_ALEMBIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ALEMBIC ${LIBDIR}/alembic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ALEMBIC ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,13 +87,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_OPENSUBDIV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSUBDIV ${LIBDIR}/opensubdiv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENSUBDIV ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,38 +83,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_JACK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(JACK_FRAMEWORK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NAMES jackmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NAMES jack PATHS ${LIBDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT JACK_FRAMEWORK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(WITH_JACK OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# -------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Find precompiled libraries, and avoid system or user-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(EXISTS ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- without_system_libs_begin()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_ALEMBIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Alembic)
</span> endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,10 +104,10 @@
</span>
if(WITH_CODEC_SNDFILE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LIBSNDFILE ${LIBDIR}/sndfile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LIBSNDFILE ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib) # TODO, deprecate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(SndFile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(_sndfile_FLAC_LIBRARY NAMES flac HINTS ${LIBDIR}/sndfile/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(_sndfile_OGG_LIBRARY NAMES ogg HINTS ${LIBDIR}/ffmpeg/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(_sndfile_FLAC_LIBRARY NAMES flac HINTS ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(_sndfile_OGG_LIBRARY NAMES ogg HINTS ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND LIBSNDFILE_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_sndfile_FLAC_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_sndfile_OGG_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +124,7 @@
</span>
if(WITH_PYTHON)
# we use precompiled libraries for py 3.7 and up by default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,95 +60,22 @@
</span> + set(PYTHON_VERSION @@py_ver@@)
if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with blender
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,11 +134,11 @@
</span> # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
else()
# module must be compiled against Python framework
- set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
+ set(_py_framework "${FRAMEWORK_SEARCH_PATHS}/Python.framework/Versions/${PYTHON_VERSION}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
</span> - set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}")
</span> + set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}")
# 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;'>-@@ -130,26 +134,40 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_FFTW3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(FFTW3 ${LIBDIR}/fftw3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(FFTW3 ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FFTW3_LIBRARIES fftw3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FFTW3_LIBPATH ${FFTW3}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(ZLIB /usr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(ZLIB ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ZLIB_INCLUDE_DIRS "${ZLIB}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ZLIB_LIBRARIES z bz2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PNG_LIBRARIES png ${ZLIB_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(JPEG_LIBRARIES jpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(FREETYPE ${LIBDIR}/freetype)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(FREETYPE ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FREETYPE_LIBPATH ${FREETYPE}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FREETYPE_LIBRARY freetype)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(WITH_LZO AND WITH_SYSTEM_LZO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LZO ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LZO_INCLUDE_DIR ${LZO}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LZO_LIBRARY lzo2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LZO_LIBRARIES ${LZO_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(WITH_SYSTEM_EIGEN3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(EIGEN3 ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(EIGEN3_INCLUDE_DIR ${EIGEN3}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR} ${EIGEN3}/include/eigen3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(EIGEN3_LIBRARY eigen3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_IMAGE_OPENEXR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENEXR ${LIBDIR}/openexr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENEXR ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENEXR_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_CODEC_FFMPEG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(FFMPEG ${LIBDIR}/ffmpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(FFMPEG ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FFMPEG_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avcodec avdevice avformat avutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,9 +193,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use openjpeg from libdir that is linked into ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENJPEG ${LIBDIR}/openjpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENJPEG ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(SYSTEMSTUBS_LIBRARY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,28 +216,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,18 +199,18 @@
</span> list(APPEND PLATFORM_LINKLIBS c++)
if(WITH_JACK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,131 +90,69 @@
</span> endif()
if(WITH_OPENCOLLADA)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENCOLLADA ${LIBDIR}/opencollada)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENCOLLADA ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENCOLLADA_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LIBDIR}/opencollada/include/COLLADAStreamWriter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LIBDIR}/opencollada/include/COLLADABaseUtils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LIBDIR}/opencollada/include/COLLADAFramework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${LIBDIR}/opencollada/include/GeneratedSaxParser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LIBDIR}/include/opencollada/COLLADAStreamWriter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LIBDIR}/include/opencollada/COLLADABaseUtils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LIBDIR}/include/opencollada/COLLADAFramework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LIBDIR}/include/opencollada/COLLADASaxFrameworkLoader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LIBDIR}/include/opencollada/GeneratedSaxParser
</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:#ffe0e0;'>- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENCOLLADA_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OpenCOLLADASaxFrameworkLoader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -L${OPENCOLLADA_LIBPATH}/opencollada
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lOpenCOLLADASaxFrameworkLoader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lOpenCOLLADAFramework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lOpenCOLLADABaseUtils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lOpenCOLLADAStreamWriter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,32 +252,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_SDL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(SDL ${LIBDIR}/sdl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SDL ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SDL_INCLUDE_DIR ${SDL}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SDL_LIBRARY SDL2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SDL_LIBPATH ${SDL}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OpenCOLLADA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(PCRE_LIBRARIES NAMES pcre HINTS ${LIBDIR}/opencollada/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(XML2_LIBRARIES NAMES xml2 HINTS ${LIBDIR}/opencollada/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(PCRE_LIBRARIES NAMES pcre HINTS ${LIBDIR}/lib/opencollada)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(XML2_LIBRARIES NAMES xml2 HINTS ${LIBDIR}/lib/opencollada)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print_found_status("PCRE" "${PCRE_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print_found_status("XML2" "${XML2_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,14 +222,14 @@
</span> set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework ForceFeedback")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--set(PNG "${LIBDIR}/png")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(PNG "${LIBDIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PNG_INCLUDE_DIRS "${PNG}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PNG_LIBPATH ${PNG}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(PNG_ROOT ${LIBDIR}/png)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(PNG_ROOT ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PNG REQUIRED)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--set(JPEG "${LIBDIR}/jpeg")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(JPEG "${LIBDIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(JPEG_INCLUDE_DIR "${JPEG}/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(JPEG_LIBPATH ${JPEG}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(JPEG_ROOT ${LIBDIR}/jpeg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(JPEG_ROOT ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(JPEG REQUIRED)
</span>
if(WITH_IMAGE_TIFF)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(TIFF ${LIBDIR}/tiff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(TIFF ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TIFF_INCLUDE_DIR ${TIFF}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TIFF_LIBRARY tiff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TIFF_LIBPATH ${TIFF}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TIFF_ROOT ${LIBDIR}/tiff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(TIFF_ROOT ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TIFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT TIFF_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(WARNING "TIFF not found, disabling WITH_IMAGE_TIFF")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,12 +239,15 @@
</span>
if(WITH_BOOST)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BOOST ${LIBDIR}/boost)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(BOOST ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BOOST_INCLUDE_DIR ${BOOST}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BOOST_POSTFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(BOOST_POSTFIX "-mt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BOOST_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost_date_time${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost_filesystem${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,6 +286,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost_thread${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost_wave${BOOST_POSTFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(Boost_NO_BOOST_CMAKE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BOOST_ROOT ${LIBDIR}/boost)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(Boost_NO_SYSTEM_PATHS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(BOOST_ROOT ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set(Boost_NO_SYSTEM_PATHS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_boost_FIND_COMPONENTS date_time filesystem regex system thread wave)
</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_FIND_COMPONENTS locale)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> + if(WITH_PYTHON)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND BOOST_LIBRARIES boost_python@@py_ver_nodot@@${BOOST_POSTFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND _boost_FIND_COMPONENTS python@@py_ver_nodot@@)
</span> + endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_INTERNATIONAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND BOOST_LIBRARIES boost_locale${BOOST_POSTFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_CYCLES_NETWORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND _boost_FIND_COMPONENTS serialization)
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -285,10 +307,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_OPENIMAGEIO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENIMAGEIO ${LIBDIR}/openimageio)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENIMAGEIO ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENIMAGEIO_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${OPENIMAGEIO}/lib/libOpenImageIO.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PNG_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${JPEG_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${TIFF_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,29 +326,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${OPENEXR_LIBPATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${ZLIB_LIBPATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ZLIB_LIBRARIES}
</span> )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
</span> - set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
</span> + set(OPENIMAGEIO_IDIFF "${LIBDIR}/bin/idiff")
endif()
if(WITH_OPENCOLORIO)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENCOLORIO ${LIBDIR}/opencolorio)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENCOLORIO ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,7 +289,7 @@
</span>
if(WITH_OPENVDB)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENVDB ${LIBDIR}/openvdb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENVDB ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OPENVDB_LIBRARIES openvdb blosc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENVDB_LIBPATH ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OpenVDB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/openvdb/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(BLOSC_LIBRARIES NAMES blosc HINTS ${LIBDIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print_found_status("Blosc" "${BLOSC_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
</span> set(OPENVDB_DEFINITIONS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_LLVM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LLVM_ROOT_DIR ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config-mp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config-mp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LLVM_CONFIG llvm-config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,20 +386,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,20 +308,12 @@
</span> endif()
if(WITH_CYCLES_OSL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,17 +174,14 @@
</span> + if(NOT OSL_ROOT)
+ set(OSL_ROOT ${CYCLES_OSL})
+ endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(OpenShadingLanguage)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(OSL)
</span> + if(NOT OSL_FOUND)
message(STATUS "OSL not found")
set(WITH_CYCLES_OSL OFF)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,23 +433,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,29 +365,29 @@
</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:#ffe0e0;'>-+ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(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")
+ message(STATUS "Using ${LIBDIR}/lib/libomp for OpenMP")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,15 +195,47 @@
</span> + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/lib/libomp' -lomp")
# Copy libomp.dylib to allow executables like datatoc and tests to work.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # `@executable_path/../Resources/lib/` is a default dylib search path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For single config generator datatoc, tests etc.
</span> 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
+ COMMAND ln -s ${LIBDIR}/lib/libomp/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For multi-config generator datatoc, etc.
</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
+ COMMAND ln -s ${LIBDIR}/lib/libomp/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For multi-config generator tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/tests/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/tests/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,8 +408,20 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(EXISTS ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- without_system_libs_end()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(WITH_LZO AND WITH_SYSTEM_LZO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(LZO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT LZO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Failed finding system LZO version!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(WITH_SYSTEM_EIGEN3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Eigen3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT EIGEN3_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Failed finding system Eigen3 version!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</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;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 89a76a04146..d601bb96249 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 2021-02-13 12:39:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2021-02-13 13:02:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -924,6 +924,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2021-03-15 01:09:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2021-03-15 01:13:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -932,6 +932,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;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> + # manpage only with 'blender' binary
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION @@PREFIX@@/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION @@prefix@@/share/man/man1
</span> + )
+ endif()
endif()
<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 fd7eb8d71fe..6dff1d90114 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-08-31 08:03:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-02-13 12:44:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-11-25 03:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2021-03-15 01:08:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,7 +240,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;'>-@@ -242,7 +242,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,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;'>-@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,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;'>-@@ -291,18 +291,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,18 +301,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;'>-@@ -326,7 +326,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,7 +336,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,7 +58,7 @@
</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;'>-@@ -440,7 +440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -454,7 +454,7 @@
</span> mark_as_advanced(TEST_PYTHON_EXE)
# Documentation
</pre><pre style='margin:0'>
</pre>