<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1ea9e46341c0e9820442312a1d01100697d03d9f">https://github.com/macports/macports-ports/commit/1ea9e46341c0e9820442312a1d01100697d03d9f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1ea9e46341c0e9820442312a1d01100697d03d9f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Apr 18 07:54:46 2021 -0700

<span style='display:block; white-space:pre;color:#404040;'>    openimageio: correctly find JPEG libraries
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    OpenJPEG and libjpeg-turbo were dependencies but were not being found.
</span>---
 graphics/openimageio/Portfile                         | 11 ++++++-----
 .../openimageio/files/patch-FindOpenJpeg.cmake.diff   | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 816b00294c1..411b5929c53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup               active_variants 1.1
</span> PortGroup               compiler_blacklist_versions 1.0
 
 github.setup            OpenImageIO oiio 2.1.17.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                4
</span> name                    openimageio
 categories              graphics
 license                 BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,8 @@ github.master_sites     ${github.homepage}/archive
</span> distname                Release-${version}
 worksrcdir              oiio-Release-${version}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-FindOpenJpeg.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # avoid
 #    ccache: error: Failed to create directory ${prefix}/var/macports/build/.ccache/tmp: Operation not permitted
 configure.args-append   -DUSE_CCACHE=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +50,6 @@ depends_lib-append      port:robin-map \
</span>                         port:zlib \
                         port:bzip2 \
                         port:boost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        path:include/turbojpeg.h:libjpeg-turbo \
</span>                         port:libpng \
                         port:tiff \
                         port:ilmbase \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,12 +108,12 @@ depends_lib-append          port:field3d
</span> #configure.args-append       -DUSE_FFMPEG=OFF
 depends_lib-append          port:ffmpeg
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# conflicts with jpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append       -DUSE_JPEGTURBO=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_lib-append          port:libjpeg-turbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.args-append       -DUSE_JPEGTURBO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append          path:include/turbojpeg.h:libjpeg-turbo \
</span> 
 #configure.args-append       -DUSE_OPENJPEG=OFF
 depends_lib-append          port:openjpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append       -DOpenJpeg_ROOT=${prefix}
</span> 
 #configure.args-append       -DUSE_OCIO=OFF
 depends_lib-append          port:opencolorio
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-FindOpenJpeg.cmake.diff b/graphics/openimageio/files/patch-FindOpenJpeg.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6bb3a6c98f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/files/patch-FindOpenJpeg.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OpenJPEG seems to include its version number in its include directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of this writing, OpenJPEG is at 2.4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+However, add later versions for future use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmake/modules/FindOpenJpeg.cmake.orig      2020-07-01 11:06:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmake/modules/FindOpenJpeg.cmake   2021-04-18 07:39:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,6 +90,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${OpenJpeg_library_paths}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (OpenJpeg_include_paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${OpenJpeg_ROOT}/include/openjpeg-2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${OpenJpeg_ROOT}/include/openjpeg-2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${OpenJpeg_ROOT}/include/openjpeg-2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${OpenJpeg_ROOT}/include/openjpeg-2.1
</span></pre><pre style='margin:0'>

</pre>