<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/67edbae5e5700c19e8b57636029feb3fcd393740">https://github.com/macports/macports-ports/commit/67edbae5e5700c19e8b57636029feb3fcd393740</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 67edbae5e57 openimageio: avoid using Wall/Werror; rev-bump to rebuild See: https://trac.macports.org/ticket/67346
</span>67edbae5e57 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67edbae5e5700c19e8b57636029feb3fcd393740
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jul 6 16:05:23 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> openimageio: avoid using Wall/Werror; rev-bump to rebuild
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67346
</span>---
graphics/openimageio/Portfile | 7 ++++---
.../patch-2.1.20-cmake-disable-wall-werror.diff | 23 ++++++++++++++++++++++
... => patch-2.4.5-cmake-disable-wall-werror.diff} | 12 ++++++++---
3 files changed, 36 insertions(+), 6 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 205fff3e473..a1266c038fe 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;'>@@ -26,13 +26,13 @@ if {${os.platform} eq "darwin" && ${os.major} >= 20} {
</span>
if {${port_latest}} {
github.setup OpenImageIO oiio 2.4.5.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 7
</span> checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
size 31938357
} else {
github.setup OpenImageIO oiio 2.1.20.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 12
</span> checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
size 29115990
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,13 +44,14 @@ github.tarball_from archive
</span>
if {${port_latest}} {
patchfiles-append patch-enforce-clang14.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-2.4.5-cmake-disable-wall.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-2.4.5-cmake-disable-wall-werror.diff
</span>
depends_lib-append port:imath \
port:openexr
} else {
patchfiles-append patch-FindOpenJpeg.cmake.diff
patchfiles-append patch-libraw-0.21.0.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-2.1.20-cmake-disable-wall-werror.diff
</span>
depends_lib-append port:field3d \
port:openexr2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-2.1.20-cmake-disable-wall-werror.diff b/graphics/openimageio/files/patch-2.1.20-cmake-disable-wall-werror.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5a516173cec
</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-2.1.20-cmake-disable-wall-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmake/compiler.cmake.orig 2023-06-26 09:36:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmake/compiler.cmake 2023-06-26 09:37:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,9 +82,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option (STOP_ON_WARNING "Stop building if there are any compiler warnings" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_compile_options ("-Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_compile_options ("-Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (STOP_ON_WARNING OR DEFINED ENV{CI})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_compile_options ("-Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_compile_options ("-Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # N.B. Force CI builds (Travis defines $CI) to use -Werror, even if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # STOP_ON_WARNING has been switched off by default, which we may do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in release branches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable warning about unused command line arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_compile_options ("-Qunused-arguments")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't warn if we ask it not to warn about warnings it doesn't know
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_compile_options ("-Wunknown-warning-option")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_compile_options ("-Wno-unknown-warning-option")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CLANG_VERSION_STRING VERSION_GREATER_EQUAL 3.6 OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPLECLANG_VERSION_STRING VERSION_GREATER 6.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_compile_options ("-Wno-unused-local-typedefs")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-2.4.5-cmake-disable-wall.diff b/graphics/openimageio/files/patch-2.4.5-cmake-disable-wall-werror.diff
</span>similarity index 72%
rename from graphics/openimageio/files/patch-2.4.5-cmake-disable-wall.diff
rename to graphics/openimageio/files/patch-2.4.5-cmake-disable-wall-werror.diff
<span style='display:block; white-space:pre;color:#808080;'>index c369406a9b6..2fc2d0948ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/files/patch-2.4.5-cmake-disable-wall.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/files/patch-2.4.5-cmake-disable-wall-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cmake/compiler.cmake.orig 2023-06-24 11:55:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cmake/compiler.cmake 2023-06-24 11:56:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmake/compiler.cmake.orig 2023-06-26 09:39:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmake/compiler.cmake 2023-06-26 09:39:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,12 +100,12 @@
</span> endif()
option (EXTRA_WARNINGS "Enable lots of extra pedantic warnings" OFF)
if (NOT MSVC)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,12 @@
</span> if (EXTRA_WARNINGS)
add_compile_options ("-Wextra")
endif ()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (STOP_ON_WARNING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_compile_options ("-Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_compile_options ("-Werror")
</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> @@ -151,7 +151,7 @@
# disable warning about unused command line arguments
add_compile_options ("-Qunused-arguments")
</pre><pre style='margin:0'>
</pre>