<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/793511e76b0380403fcb267543b9439977b47825">https://github.com/macports/macports-ports/commit/793511e76b0380403fcb267543b9439977b47825</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 793511e76b0380403fcb267543b9439977b47825
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Oct 29 14:11:08 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    OpenSceneGraph-devel: merge recent fixes from OpenSceneGraph
</span>---
 graphics/OpenSceneGraph-devel/Portfile             |  7 ++--
 .../files/patch-CMakeLists.txt.diff                | 40 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph-devel/Portfile b/graphics/OpenSceneGraph-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 036037e..911a3a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/OpenSceneGraph-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,10 @@ checksums               rmd160  b34789adf0c6413bcfa4ef2955e67d52f8210255 \
</span>                         sha256  ba75a5a8ab30fcb2cfd0e52309b1a8aefd59ae10864cc9749ee7f8deaed7cf86 \
                         size    5807704
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# respect MacPorts compiler flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/45287
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> depends_build-append    port:pkgconfig
 
 depends_lib             port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +47,6 @@ depends_lib             port:freetype \
</span>                         port:boost \
                         port:gstreamer1-gst-plugins-base
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append   -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \
                         -DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \
                         -DOSG_WINDOWING_SYSTEM=Cocoa
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +67,7 @@ configure.args-append   -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span>                         -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 \
                         -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
                         -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=1 \
</span>                         -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
 
 livecheck.type          none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff b/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..682385b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2018-08-29 01:07:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-10-29 12:34:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -991,7 +991,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #C4706 assignment within conditional expression
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #C4589: Constructor of abstract class 'osgGA::CameraManipulator' ignores initializer for virtual base class 'osg::Object'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4589 /wd4706 /wd4127 /wd4100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         SET(OSG_AGGRESSIVE_WARNING_FLAGS  -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -Wno-overloaded-virtual)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # CMake lacks an elseif, so other non-gcc, non-VS compilers need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1002,25 +1002,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             SET(OSG_CXX_LANGUAGE_STANDARD "C++11" CACHE STRING "set the c++ language standard (C++98 / GNU++98 / C++11) for OSG" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             MARK_AS_ADVANCED(OSG_CXX_LANGUAGE_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             # remove existing flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            REMOVE_CXX_FLAG(-std=c++98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            REMOVE_CXX_FLAG(-std=gnu++98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            REMOVE_CXX_FLAG(-std=c++11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            REMOVE_CXX_FLAG(-stdlib=libstdc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            REMOVE_CXX_FLAG(-stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             IF(${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "c++98" OR ${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "C++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -stdlib=libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 IF(${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "gnu++98" OR ${OSG_CXX_LANGUAGE_STANDARD} STREQUAL "GNU++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "gnu++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98 -stdlib=libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</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></pre><pre style='margin:0'>

</pre>