<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/422b820995fdb24ee48cbaab00c04c4b7e0d09e7">https://github.com/macports/macports-ports/commit/422b820995fdb24ee48cbaab00c04c4b7e0d09e7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 422b820995fdb24ee48cbaab00c04c4b7e0d09e7
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed May 17 19:12:26 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> OpenSceneGraph-devel: reconcile with OpenSceneGraph
</span>---
graphics/OpenSceneGraph-devel/Portfile | 11 +++-
.../OpenSceneGraph-devel/files/patch-openexr3.diff | 71 ++++++++++++++++++++++
2 files changed, 80 insertions(+), 2 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 6deddc054ea..3ba96c974f4 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;'>@@ -10,7 +10,7 @@ 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 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> conflicts OpenSceneGraph
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,17 +31,23 @@ checksums rmd160 a6016a81357d2b96a3141d98a2f883be42f4081b \
</span> # see https://trac.macports.org/ticket/45287
patchfiles-append patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/openscenegraph/OpenSceneGraph/issues/1075
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openexr3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:pkgconfig
depends_lib port:curl \
port:dcmtk \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span> port:freetype \
port:gdal \
port:giflib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:gstreamer1-gst-plugins-base \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:imath \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper \
</span> port:libpng \
path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
port:openexr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +56,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-devel/files/patch-openexr3.diff b/graphics/OpenSceneGraph-devel/files/patch-openexr3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aedb3865440
</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-devel/files/patch-openexr3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.gentoo.org/833491
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(ilmbase)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(Inventor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(Jasper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(OpenEXR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FIND_PACKAGE(OpenEXR CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(OpenCascade)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(COLLADA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(FBX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/osgPlugins/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osgPlugins/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(JASPER_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_PLUGIN_DIRECTORY(jp2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(OpenEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_PLUGIN_DIRECTORY(exr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(GIFLIB_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/osgPlugins/exr/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osgPlugins/exr/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(TARGET_SRC ReaderWriterEXR.cpp )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(TARGET_LIBRARIES_VARS ${OPENEXR_LIBRARIES_VARS} ${ILMBASE_LIBRARIES_VARS} ZLIB_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(OPENEXR_LIBRARIES_VARS OpenEXR::OpenEXR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(TARGET_LIBRARIES_VARS OPENEXR_LIBRARIES_VARS ZLIB_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ REMOVE_CXX_FLAG(-Wshadow)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osgPlugins/exr/ReaderWriterEXR.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,11 +41,11 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _inStream->read(c,n).good();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual Int64 tellg ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual uint64_t tellg ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _inStream->tellg();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual void seekg (Int64 pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual void seekg (uint64_t pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _inStream->seekg(pos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,11 +69,11 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _outStream->write(c,n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual Int64 tellp ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual uint64_t tellp ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _outStream->tellp();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual void seekp (Int64 pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual void seekp (uint64_t pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _outStream->seekp(pos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span></pre><pre style='margin:0'>
</pre>