<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/5f328881758162dcb4e2c0c367378015454dce39">https://github.com/macports/macports-ports/commit/5f328881758162dcb4e2c0c367378015454dce39</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 5f32888 OpenSceneGraph-devel: update to version 3.7.0 git master as of 20200529
</span>5f32888 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f328881758162dcb4e2c0c367378015454dce39
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Jun 1 17:57:54 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> OpenSceneGraph-devel: update to version 3.7.0 git master as of 20200529
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * builds with gdal 3.1.0
</span><span style='display:block; white-space:pre;color:#404040;'> * no longer supports OpenVRML
</span>---
graphics/OpenSceneGraph-devel/Portfile | 13 ++--
.../files/patch-CMakeLists.txt.diff | 69 +++++++++++-----------
2 files changed, 40 insertions(+), 42 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 9bb479d..b742599 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;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 6b7bd07e33b2cc068bee84c21b360d7077ecacb2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20181028
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit ba2a6f7339055647a98b3d0c1afe36036f6a6979
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20200529
</span> github.setup openscenegraph OpenSceneGraph ${git_commit}
name OpenSceneGraph-devel
version 3.7.0-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> conflicts OpenSceneGraph
platforms darwin
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description ${name} is a high-performance 3D graphics toolkit useful
</span>
homepage http://www.openscenegraph.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dfaeb83c23cb6a8aea36f141dc360dded85998e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 845823c997a3821ad7ef181b3d326a3e525efde94536874986020f7e45dfe8da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5810967
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a6016a81357d2b96a3141d98a2f883be42f4081b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0906aba0a7951854e5be89d9a14944cd5de4d6c94b8f5e4145a8ec939b1bb729 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5827462
</span>
# respect MacPorts compiler flags
# see https://trac.macports.org/ticket/45287
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,6 @@ configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1
<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><span style='display:block; white-space:pre;color:#808080;'>index 682385b..adb97ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
</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;'>@@ -1,40 +1,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-08-29 01:07:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-10-29 12:34:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -991,7 +991,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #C4706 assignment within conditional expression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #C4589: Constructor of abstract class 'osgGA::CameraManipulator' ignores initializer for virtual base class 'osg::Object'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4589 /wd4706 /wd4127 /wd4100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-05-29 03:11:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-06-01 20:20:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1100,7 +1100,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> -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>+ 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:#ffe0e0;'>- # CMake lacks an elseif, so other non-gcc, non-VS compilers need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1002,25 +1002,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- MARK_AS_ADVANCED(OSG_CXX_LANGUAGE_STANDARD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove existing flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REMOVE_CXX_FLAG(-std=c++98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REMOVE_CXX_FLAG(-std=gnu++98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REMOVE_CXX_FLAG(-std=c++11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REMOVE_CXX_FLAG(-stdlib=libstdc++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- REMOVE_CXX_FLAG(-stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1108,24 +1108,16 @@
</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:#ffe0e0;'>- 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:#ffe0e0;'>- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -stdlib=libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "gnu++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98 -stdlib=libstdc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</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;'>+ 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;'>+ ELSEIF(${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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual -Wno-conversion")
</span></pre><pre style='margin:0'>
</pre>