<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67a717ebff2bd2037d9f7a48af9c53cb304493e6">https://github.com/macports/macports-ports/commit/67a717ebff2bd2037d9f7a48af9c53cb304493e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 67a717ebff2bd2037d9f7a48af9c53cb304493e6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed May 17 17:04:30 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    OpenSceneGraph: fix patch for openexr; have cmake set cxx_standard
</span>---
 graphics/OpenSceneGraph/Portfile                   |  4 +--
 .../OpenSceneGraph/files/patch-CMakeLists.txt.diff | 40 ----------------------
 graphics/OpenSceneGraph/files/patch-openexr3.diff  |  9 +++--
 3 files changed, 7 insertions(+), 46 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/Portfile b/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 748aa0e6143..7b84ff559dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,6 @@ checksums               rmd160  d51b565206bdd4d49e8374a7a72c3686965218ff \
</span>                         sha256  b46b9bfc725daa18c40630822b58baa0ec0e504d2cff96cc4ace06a1f173ecfd \
                         size    5781086
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# respect MacPorts compiler flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/45287
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-CMakeLists.txt.diff
</span> # see https://github.com/openscenegraph/OpenSceneGraph/issues/1075
 patchfiles-append       patch-openexr3.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +48,7 @@ depends_lib             port:curl \
</span>                         port:zlib
 
 compiler.cxx_standard   2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.set_cxx_standard  yes
</span> 
 configure.args-append   -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \
                         -DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff b/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 166f60c4400..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2019-07-26 04:54:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-09-09 21:21:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1022,7 +1022,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:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><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:#ffe0e0;'>- 
</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;'>-@@ -1033,25 +1033,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:#ffe0e0;'>- 
</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:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/files/patch-openexr3.diff b/graphics/OpenSceneGraph/files/patch-openexr3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e275502fa0..aedb3865440 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/files/patch-openexr3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/OpenSceneGraph/files/patch-openexr3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,11 @@
</span> https://bugs.gentoo.org/833491
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -752,7 +752,6 @@ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2020-01-31 06:03:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-05-17 17:00:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,10 +739,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Common to all platforms except android:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     FIND_PACKAGE(Freetype)
</span> -    FIND_PACKAGE(ilmbase)
      FIND_PACKAGE(Inventor)
      FIND_PACKAGE(Jasper)
</pre><pre style='margin:0'>

</pre>