<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/b63c58550183b8851d24c5af07c3b0b652f515bf">https://github.com/macports/macports-ports/commit/b63c58550183b8851d24c5af07c3b0b652f515bf</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 b63c585 OpenSceneGraph(-devel): address opportunistic configuration issues
</span>b63c585 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b63c58550183b8851d24c5af07c3b0b652f515bf
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Dec 1 16:28:08 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> OpenSceneGraph(-devel): address opportunistic configuration issues
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add available dependencies not otherwise disabled
</span><span style='display:block; white-space:pre;color:#404040;'> * sort dependencies for clarity (both enabled and disabled)
</span><span style='display:block; white-space:pre;color:#404040;'> * disable examples which introduce additional dependency issues
</span><span style='display:block; white-space:pre;color:#404040;'> * rebuild with new dependencies
</span>---
graphics/OpenSceneGraph-devel/Portfile | 44 ++++++++++++++++++----------------
graphics/OpenSceneGraph/Portfile | 41 +++++++++++++++++--------------
2 files changed, 47 insertions(+), 38 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 ef300a5..9bb479d 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;'>@@ -9,7 +9,7 @@ set git_date 20181028
</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 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> conflicts OpenSceneGraph
platforms darwin
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,43 +33,47 @@ patchfiles-append patch-CMakeLists.txt.diff
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:boost \
</span> port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dcmtk \
</span> path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:poppler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span> port:giflib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler \
</span> port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer1-gst-plugins-base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
compiler.cxx_standard 2011
configure.args-append -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \
-DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSG_WINDOWING_SYSTEM=Cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOSG_WINDOWING_SYSTEM=Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_OSG_EXAMPLES=NO
</span>
# disable unwanted optional dependencies to avoid opportunistic configuration
# TODO: add some of these back either directly or as variants after testing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_FBX=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_GTA=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1
</span>
livecheck.type none
<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 fe8a400..453f406 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;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup openscenegraph OpenSceneGraph 3.6.4 OpenSceneGraph-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> conflicts OpenSceneGraph-devel
platforms darwin
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,43 +29,47 @@ patchfiles-append patch-CMakeLists.txt.diff
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:boost \
</span> port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dcmtk \
</span> path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:poppler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span> port:giflib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler \
</span> port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer1-gst-plugins-base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
compiler.cxx_standard 2011
configure.args-append -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \
-DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSG_WINDOWING_SYSTEM=Cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOSG_WINDOWING_SYSTEM=Cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_OSG_EXAMPLES=NO
</span>
# disable unwanted optional dependencies to avoid opportunistic configuration
# TODO: add some of these back either directly or as variants after testing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_FBX=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_GTA=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1
</span>
github.livecheck.regex {(\d+(?:\.\d+)+)}
</pre><pre style='margin:0'>
</pre>