<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/68b7f347a5129d3ce9e318c7060aebb85297d77c">https://github.com/macports/macports-ports/commit/68b7f347a5129d3ce9e318c7060aebb85297d77c</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 68b7f347a51 blender: update to version 2.83.0
</span>68b7f347a51 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68b7f347a5129d3ce9e318c7060aebb85297d77c
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sat Sep 12 11:04:05 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> blender: update to version 2.83.0
</span>---
graphics/blender/Portfile | 12 +++----
.../blender/files/patch-macports-libs-creator.diff | 6 ++--
.../files/patch-macports-libs-platform_apple.diff | 42 +++++++++-------------
.../blender/files/patch-manpage-for-apple.diff | 6 ++--
graphics/blender/files/patch-unix-or-apple.diff | 16 ++++-----
5 files changed, 36 insertions(+), 46 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 8d5fe088ac3..f3b48689b17 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;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
name blender
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.82a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.83.0
</span> revision 0
categories graphics multimedia
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {GPL-2+ OpenSSLException}
</span> maintainers @jasonliu--
homepage https://www.blender.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,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 477b18c4d51ed6e5214158f1438c2c9a4317b2e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4de00030201d14e98cce3d3ed61b3c72267fb07dbd46ba779dc261a3d56beba3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 39890216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 227b412d69c2e3db4de05f8a3cfbc762934dcb31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 14e2bc85e076b12ae94438ff3c1dd417eba642840ed32d7c979724a93aa93f1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38515064
</span>
compiler.cxx_standard 2011
# We need to blacklist Xcode Clang/LLVM, because Blender needs to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,7 +256,7 @@ post-destroot {
</span>
livecheck.type regex
livecheck.url https://www.blender.org/download/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Download Blender (\\d+.\\d+(?:\[a-z\]+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex Download Blender (\\d+.\\d+(?:.\\d+)*)
</span>
variant manpage description {Build manpage} {
patchfiles-append patch-manpage-for-apple.diff
<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 442d636eebc..af749bf2779 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-04-27 21:19:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2020-05-01 09:58:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2020-09-03 10:32:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2020-09-03 10:33:07.000000000 -0400
</span> @@ -76,9 +76,28 @@
if(WITH_TBB)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span>
if(WITH_PYTHON)
blender_include_dirs(../blender/python)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -939,14 +958,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -949,14 +968,14 @@
</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 4596abebc80..14c89311ac7 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_files/cmake/platform/platform_apple.cmake.orig 2020-04-22 22:22:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_files/cmake/platform/platform_apple.cmake 2020-07-21 20:56:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ build_files/cmake/platform/platform_apple.cmake 2020-09-03 11:09:31.000000000 -0400
</span> @@ -38,6 +38,10 @@
message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
endif()
<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,69 +212,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,28 +212,29 @@
</span> list(APPEND PLATFORM_LINKLIBS c++)
if(WITH_JACK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,18 +185,7 @@
</span> -lOpenCOLLADAFramework
-lOpenCOLLADABaseUtils
-lOpenCOLLADAStreamWriter
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -lMathMLSolver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lGeneratedSaxParser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lbuffer -lftoa -lUTF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${OPENCOLLADA_LIBPATH}/libxml2.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${OPENCOLLADA_LIBPATH}/libxml2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PCRE is bundled with openCollada
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # set(PCRE ${LIBDIR}/pcre)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # set(PCRE_LIBPATH ${PCRE}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PCRE ${LIBDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(PCRE_LIBPATH ${PCRE}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(PCRE_LIBRARIES pcre)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,32 +248,32 @@
</span> endif()
if(WITH_SDL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,7 +224,7 @@
</span> set(BOOST_LIBRARIES
boost_date_time${BOOST_POSTFIX}
boost_filesystem${BOOST_POSTFIX}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,10 +302,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,10 +300,10 @@
</span> endif()
if(WITH_OPENIMAGEIO)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,7 +237,7 @@
</span> ${PNG_LIBRARIES}
${JPEG_LIBRARIES}
${TIFF_LIBRARY}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,29 +321,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,29 +319,29 @@
</span> ${OPENEXR_LIBPATH}
${ZLIB_LIBPATH}
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +275,7 @@
</span> else()
set(LLVM_CONFIG llvm-config)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,7 +381,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,7 +379,7 @@
</span> endif()
if(WITH_CYCLES_OSL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,7 +284,7 @@
</span>
find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -417,20 +436,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -400,21 +419,21 @@
</span> if(WITH_OPENMP)
if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
# Use OpenMP from our precompiled libraries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,13 +301,14 @@
</span>
# Copy libomp.dylib to allow executables like datatoc and tests to work.
execute_process(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ln -s ${LIBDIR}/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND cp -p ${LIBDIR}/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span> execute_process(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ln -s ${LIBDIR}/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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;'>+ )
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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 36211234c75..46dfcd1096d 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-03-12 01:06:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/creator/CMakeLists.txt 2020-09-02 01:59:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -869,6 +869,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/creator/CMakeLists.txt.orig 2020-09-03 10:33:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/creator/CMakeLists.txt 2020-09-03 10:47:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -893,6 +893,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 aac8fe599a9..830e5309f17 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-04-21 15:05:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-04-21 15:07:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,7 +219,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-09-03 10:37:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-09-03 10:37:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,7 +227,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;'>-@@ -231,7 +231,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,7 +239,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;'>-@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,7 +249,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;'>-@@ -281,18 +281,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,18 +289,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;'>-@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,7 +328,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;'>-@@ -419,7 +419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,7 +431,7 @@
</span> option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF)
# Documentation
</pre><pre style='margin:0'>
</pre>