<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/513f00900b7bf397b5d8206ca676481c09f9d84b">https://github.com/macports/macports-ports/commit/513f00900b7bf397b5d8206ca676481c09f9d84b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 513f00900b7bf397b5d8206ca676481c09f9d84b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Apr 28 17:39:39 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> OpenSceneGraph-devel: update to version 3.7.0 git master as of 20180427
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Builds cleanly with ffmpeg 4.0.
</span>---
graphics/OpenSceneGraph-devel/Portfile | 22 +++++++++-------------
...h-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff | 16 ----------------
2 files changed, 9 insertions(+), 29 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 d2b4562..3a9b559 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;'>@@ -2,16 +2,13 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 771efca5c61db45353315b26180c1dfe24ec38d2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20170116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit b9d5e8f505bd6ebf07c5a5ef5aedd533fe3464c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20180427
</span> github.setup openscenegraph OpenSceneGraph ${git_commit}
name OpenSceneGraph-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.6-${git_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.0-${git_date}
</span> conflicts OpenSceneGraph
platforms darwin
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +22,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 4bc2df26b579e4a52f6e18090adf2294ab6b48f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b6e57329b3c4968f4d360504d942b3f51a2c4d20ffc3665499f076c247f63c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d5c8c9188f324ff633a8a55e29ab6d301d4782a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a22a32dbb60f151337eaa6c22bde2b09169443db8c272a2701cf427a224c1dc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5782782
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,14 +42,11 @@ depends_lib port:freetype \
</span> port:boost \
port:gstreamer1-gst-plugins-base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</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
# disable unwanted optional dependencies to avoid opportunistic configuration
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# before cmake 2.8 this required patching CMakeLists.txt
</span> # TODO: add some of these back either directly or as variants after testing
configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +56,6 @@ configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_GTA=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,3 +64,5 @@ configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph-devel/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff b/graphics/OpenSceneGraph-devel/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddb13ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph-devel/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/jpeg/ReaderWriterJPEG.cpp 2015-04-07 20:01:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp.new 2016-12-17 01:44:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,11 +72,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Some versions of jmorecfg.h define boolean, some don't...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Those that do also define HAVE_BOOLEAN, so we can guard using that. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAVE_BOOLEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int boolean;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FALSE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TRUE 1
</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;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CODE FOR READING/WRITING JPEG FROM STREAMS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source)
</span></pre><pre style='margin:0'>
</pre>