From 455b92bcce5921b741fc19a122e4cafd57443d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?=
 <devernay@users.noreply.github.com>
Date: Thu, 4 Apr 2024 00:07:22 +0200
Subject: [PATCH] update MacPorts

---
 tools/MacPorts/graphics/opencolorio1/Portfile |  2 ++
 .../opencolorio1/files/patch-Werror.diff      | 26 +++++++++++++++++++
 tools/MacPorts/graphics/openimageio/Portfile  |  1 -
 .../files/patch-enforce-clang14.diff          | 14 ----------
 4 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 tools/MacPorts/graphics/opencolorio1/files/patch-Werror.diff
 delete mode 100644 tools/MacPorts/graphics/openimageio/files/patch-enforce-clang14.diff

diff --git a/tools/MacPorts/graphics/opencolorio1/Portfile b/tools/MacPorts/graphics/opencolorio1/Portfile
index 17824f156d..76440ae265 100644
--- a/tools/MacPorts/graphics/opencolorio1/Portfile
+++ b/tools/MacPorts/graphics/opencolorio1/Portfile
@@ -38,6 +38,8 @@ patchfiles-append   patch-yaml-cpp-0.7.diff
 
 patchfiles-append   patch-CMakeLists.txt.diff
 
+patchfiles-append   patch-Werror.diff
+
 set my_prefix       ${prefix}/libexec/${name}
 
 configure.pre_args  -DCMAKE_INSTALL_PREFIX=${my_prefix}
diff --git a/tools/MacPorts/graphics/opencolorio1/files/patch-Werror.diff b/tools/MacPorts/graphics/opencolorio1/files/patch-Werror.diff
new file mode 100644
index 0000000000..35cd96e7ad
--- /dev/null
+++ b/tools/MacPorts/graphics/opencolorio1/files/patch-Werror.diff
@@ -0,0 +1,26 @@
+--- src/core/CMakeLists.txt.orig	2024-04-04 00:00:07
++++ src/core/CMakeLists.txt	2024-04-04 00:00:20
+@@ -23,8 +23,6 @@
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+         set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+     endif()
+-else()
+-    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+ endif()
+ 
+ # SHARED
+--- src/pyglue/CMakeLists.txt.orig	2024-04-04 00:01:06
++++ src/pyglue/CMakeLists.txt	2024-04-04 00:01:20
+@@ -20,12 +20,6 @@
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
+ endif()
+ 
+-# Process all warnings as errors
+-# Unfortunately Windows still has a warning
+-if(UNIX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-endif()
+-
+ find_package(PythonLibs)
+ if(NOT PYTHONLIBS_FOUND)
+     message(FATAL "Python libraries were not found, exiting.")
diff --git a/tools/MacPorts/graphics/openimageio/Portfile b/tools/MacPorts/graphics/openimageio/Portfile
index aa52d7e1be..cc8fd5c0b1 100644
--- a/tools/MacPorts/graphics/openimageio/Portfile
+++ b/tools/MacPorts/graphics/openimageio/Portfile
@@ -29,7 +29,6 @@ patchfiles-append oiio-2.3.20-strnlen.patch
 patchfiles-append oiio-2.4.6-sysutil.patch
 patchfiles-append oiio-2.4.6-filesystem.patch
 
-patchfiles-append   patch-enforce-clang14.diff
 patchfiles-append   patch-2.4.5-cmake-disable-wall-werror.diff
 
 depends_lib-append  port:imath \
diff --git a/tools/MacPorts/graphics/openimageio/files/patch-enforce-clang14.diff b/tools/MacPorts/graphics/openimageio/files/patch-enforce-clang14.diff
deleted file mode 100644
index e503aa8fd5..0000000000
--- a/tools/MacPorts/graphics/openimageio/files/patch-enforce-clang14.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git src/libtexture/texturesys.cpp src/libtexture/texturesys.cpp
-index d2d64dbdb..c0d4fc0e4 100644
---- src/libtexture/texturesys.cpp
-+++ src/libtexture/texturesys.cpp
-@@ -2299,9 +2299,7 @@ TextureSystemImpl::sample_bilinear(
-         else
-             tile_st %= tilewh;
-         OIIO_PRAGMA_WARNING_PUSH
--#if OIIO_CLANG_VERSION >= 140000 || OIIO_INTEL_CLANG_VERSION >= 140000
-         OIIO_CLANG_PRAGMA(GCC diagnostic ignored "-Wbitwise-instead-of-logical")
--#endif
-         bool s_onetile = (tile_st[S0] != tilewhmask[S0])
-                          & (sttex[S0] + 1 == sttex[S1]);
-         bool t_onetile = (tile_st[T0] != tilewhmask[T0])