<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/46ab2767feef80c3cff55c8d158dfb8279d91fc3">https://github.com/macports/macports-ports/commit/46ab2767feef80c3cff55c8d158dfb8279d91fc3</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 46ab2767fee embree: add static variant
</span>46ab2767fee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 46ab2767feef80c3cff55c8d158dfb8279d91fc3
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sun Dec 6 14:36:02 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> embree: add static variant
</span>---
graphics/embree/Portfile | 32 +++++++++++++++++++++++++++++
graphics/embree/files/patch-static-lib.diff | 23 +++++++++++++++++++++
2 files changed, 55 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/embree/Portfile b/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa41cf3d017..43d07634771 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup embree embree 3.10.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +43,39 @@ SET(CMAKE_INSTALL_BINDIR \${CMAKE_INSTALL_PREFIX}/share/embree\${EMBREE_VERSION_
</span> ${worksrcpath}/common/cmake/package.cmake
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DEMBREE_TUTORIALS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
if {[file exists ${destroot}${prefix}/share/uninstall.command]} {
delete ${destroot}${prefix}/share/uninstall.command
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant static description {Build Embree as a static library} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch CMake scripts to produce both static and dynamic libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # when using the +static variant. (By default, Embree's CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # scripts can be set to output either dynamic or static libraries,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but not both at the same time.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-static-lib.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DEMBREE_STATIC_LIB=ON
</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;'>+variant tutorials description {Build tutorials} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DEMBREE_TUTORIALS=OFF -DEMBREE_TUTORIALS=ON
</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;'>+variant ray_mask description {Enable ray mask support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DEMBREE_RAY_MASK=ON
</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;'>+variant backface_culling description {Enable back-face culling} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DEMBREE_BACKFACE_CULLING=ON
</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;'>+# Note: Other than the tutorials, please keep this port's default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variants synchronized with the flags used by Blender when it compiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Embree as an internal dependency. These flags can be found in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build_files/build_environment/install_deps.sh script in Blender's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# source code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +tutorials +ray_mask
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/embree/files/patch-static-lib.diff b/graphics/embree/files/patch-static-lib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..088e9ab550f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/embree/files/patch-static-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kernels/CMakeLists.txt.orig 2020-05-14 01:08:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kernels/CMakeLists.txt 2020-12-08 15:40:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,7 +221,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDMACRO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_LIBRARY(embree ${EMBREE_LIB_TYPE} ${EMBREE_LIBRARY_FILES} $<TARGET_OBJECTS:algorithms>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF (EMBREE_STATIC_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(BUILD_SHARED_LIBS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_LIBRARY(embree ${EMBREE_LIBRARY_FILES} $<TARGET_OBJECTS:algorithms>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_TARGET_PROPERTIES(embree PROPERTIES COMPILE_FLAGS "${FLAGS_LOWEST}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_TARGET_PROPERTIES(embree PROPERTIES COMPILE_DEFINITIONS "EMBREE_LOWEST_ISA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_PROPERTY(TARGET embree PROPERTY FOLDER kernels)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(EXPORT embree-targets DESTINATION ${EMBREE_CMAKEEXPORT_DIR} COMPONENT devel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installs libembree3.so link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF (NOT EMBREE_STATIC_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF (EMBREE_STATIC_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL(TARGETS embree
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY NAMELINK_ONLY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>
</pre>