<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/4a7d45fc3ec7512bf00b7c7cc887aed2ed9ab9e5">https://github.com/macports/macports-ports/commit/4a7d45fc3ec7512bf00b7c7cc887aed2ed9ab9e5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4a7d45fc3ec7512bf00b7c7cc887aed2ed9ab9e5
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Apr 22 22:51:55 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openimageio: update to 2.4.5.0; default +python311
</span>---
graphics/opencolorio/Portfile | 1 +
graphics/openimageio/Portfile | 30 ++++--
.../openimageio/files/patch-libraw-0.21.0.diff | 113 +++++++++++++++++++++
3 files changed, 135 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencolorio/Portfile b/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33f177209bd..eaced037181 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,7 @@ configure.args-append \
</span> -DCMAKE_CONFIGURATION_TYPES=MacPorts
# pin the used version for macOS before 10.13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep in mind that openimageio had the same pin
</span> if {${os.platform} eq "darwin" && ${os.major} < 18} {
github.setup AcademySoftwareFoundation OpenColorIO 1.1.1 v
revision 3
<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 ca025ea70e8..6648aadf4b7 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,11 +8,11 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OpenImageIO oiio 2.1.20.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29115990
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OpenImageIO oiio 2.4.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31938357
</span>
name openimageio
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,19 @@ compiler.thread_local_storage yes
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-FindOpenJpeg.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pin the used version for macOS before 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which is forced by used version of opencolorio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup OpenImageIO oiio 2.1.20.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29115990
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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;'>+ patch-libraw-0.21.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set port_libfmt libfmt9
cmake.module_path-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +79,7 @@ qt5.min_version 5.6
</span>
configure.args-append -DUSE_PYTHON=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 36 37 38 39 310 311}
</span>
set pythons_ports {}
foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +88,7 @@ foreach s ${pythons_suffixes} {
</span>
foreach s ${pythons_suffixes} {
set p python${s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string range ${s} 1 end]
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
variant ${p} description "Build the Python ${v} bindings" conflicts {*}${c} "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +113,7 @@ foreach s ${pythons_suffixes} {
</span> # this default version should stay synchronized with python_get_default_version
# in the python PortGroup
if {${set_python_default}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python311
</span> }
#configure.args-append -DUSE_FIELD3D=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-libraw-0.21.0.diff b/graphics/openimageio/files/patch-libraw-0.21.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ed16b084ad
</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-libraw-0.21.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,113 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backport of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/OpenImageIO/oiio/commit/3e74eae539bcd3662106009baa64ab23a3e48a75
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/OpenImageIO/oiio/commit/650772433010b5889e6d2694137cace2567ad487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/raw.imageio/rawinput.cpp src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c1b96b526..1f19f0c447 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -790,8 +790,9 @@ RawInput::get_makernotes_canon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FlashExposureLock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(ExposureMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(AESetting);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MAKERF(HighlightTonePriority);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(ImageStabilization);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MAKERF(HighlightTonePriority);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FocusMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(AFPoint, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FocusContinuous);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -812,6 +813,7 @@ RawInput::get_makernotes_canon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // short AFPointsSelected[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ushort PrimaryAFPoint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FlashMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FlashActivity);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(FlashBits, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -851,6 +853,7 @@ RawInput::get_makernotes_nikon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(ImageStabilization);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(VibrationReduction, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(VRMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(FocusMode, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(AFPoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(AFPointsInFocus, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,6 +873,7 @@ RawInput::get_makernotes_nikon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(AFAreaHeight, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(ContrastDetectAFInFocus, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(FlashSetting, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(FlashType, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FlashExposureCompensation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1016,9 +1020,11 @@ RawInput::get_makernotes_fuji()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(ExrMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(Macro);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(Rating);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 21, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FrameRate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FrameWidth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(FrameHeight);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</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;'>+diff --git src/raw.imageio/rawinput.cpp src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 816dd10c9e..dd41eb6732 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/raw.imageio/rawinput.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,9 +29,6 @@ template<class T> using auto_ptr = unique_ptr<T>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+-#include <libraw/libraw.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libraw/libraw_version.h>
</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;'>+ // This plugin utilises LibRaw:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // http://www.libraw.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +37,18 @@ template<class T> using auto_ptr = unique_ptr<T>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Example raw images from many camera models:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://www.rawsamples.ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libraw/libraw.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libraw/libraw_version.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBRAW_VERSION < LIBRAW_MAKE_VERSION(0, 15, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# error "OpenImageIO does not support such an old LibRaw"
</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;'>++// Some structure layouts changed mid-release on this snapshot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LIBRAW_VERSION_AT_LEAST_SNAPSHOT_202110 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 21, 0) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && LIBRAW_SHLIB_CURRENT >= 22)
</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;'>+ OIIO_PLUGIN_NAMESPACE_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1016,6 +1025,16 @@ RawInput::get_makernotes_canon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKERF(ContinuousDrive);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(SensorWidth, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(SensorHeight, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if LIBRAW_VERSION_AT_LEAST_SNAPSHOT_202110
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "SensorLeftBorder", mn.DefaultCropAbsolute.l, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "SensorTopBorder", mn.DefaultCropAbsolute.t, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "SensorRightBorder", mn.DefaultCropAbsolute.r, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "SensorBottomBorder", mn.DefaultCropAbsolute.b, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "BlackMaskLeftBorder", mn.LeftOpticalBlack.l, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "BlackMaskTopBorder", mn.LeftOpticalBlack.t, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "BlackMaskRightBorder", mn.LeftOpticalBlack.r, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add(m_make, "BlackMaskBottomBorder", mn.LeftOpticalBlack.b, false, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(SensorLeftBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(SensorTopBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(SensorRightBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1024,6 +1043,7 @@ RawInput::get_makernotes_canon()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(BlackMaskTopBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(BlackMaskRightBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKER(BlackMaskBottomBorder, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 19, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Extra added with libraw 0.19:
</span></pre><pre style='margin:0'>
</pre>