<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/20d446bcaea3ceb7a783ddd750a9791565c947f5">https://github.com/macports/macports-ports/commit/20d446bcaea3ceb7a783ddd750a9791565c947f5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20d446bcaea3ceb7a783ddd750a9791565c947f5
</span>Author: Marko Käning <mk@macports.org>
AuthorDate: Sat Dec 17 01:49:25 2016 +0100

<span style='display:block; white-space:pre;color:#404040;'>    OpenSceneGraph: introduce new patch as workaround for trouble with jpeg
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/52869
</span><span style='display:block; white-space:pre;color:#404040;'>    See:    https://github.com/openscenegraph/OpenSceneGraph/issues/58
</span>---
 graphics/OpenSceneGraph/Portfile                         |  5 +++--
 .../patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 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 ccae671..bd05e97 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;'>@@ -8,7 +8,7 @@ cmake.out_of_source     yes
</span> name                    OpenSceneGraph
 conflicts               OpenSceneGraph-devel
 version                 3.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                6
</span> platforms               darwin
 categories              graphics
 maintainers             nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,8 @@ depends_lib             port:freetype \
</span>                         port:boost \
                         port:gstreamer1-gst-plugins-base
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-ffmpeg-3.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</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-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff b/graphics/OpenSceneGraph/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ddb13ec
</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/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osgPlugins/jpeg/ReaderWriterJPEG.cpp       2015-04-07 20:01:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp.new   2016-12-17 01:44:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,11 +72,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Some versions of jmorecfg.h define boolean, some don't...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    Those that do also define HAVE_BOOLEAN, so we can guard using that. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_BOOLEAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   typedef int boolean;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define FALSE 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define TRUE 1
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* CODE FOR READING/WRITING JPEG FROM STREAMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  *  This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source)
</span></pre><pre style='margin:0'>

</pre>