From 40aadd894016f6ad6a1cde3d60b63ba47a72ec6c Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Sat, 13 Feb 2021 15:36:19 +0100
Subject: Build: fix macOS minimum version link warning with pystring

Patch OpenColorIO again to pass along build flags, and remove outdated
patches which were no longer being used.
---
 build_files/build_environment/cmake/opencolorio.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'build_files/build_environment/cmake')

diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake
index 7622a2afdaa..87099a06d17 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -44,13 +44,11 @@ if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
 endif()
 
 if(WIN32)
-  set(OCIO_PATCH opencolorio_win.diff)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
     -DOCIO_INLINES_HIDDEN=OFF
   )
 else()
-  set(OCIO_PATCH opencolorio.diff)
   set(OPENCOLORIO_EXTRA_ARGS
     ${OPENCOLORIO_EXTRA_ARGS}
   )
@@ -61,6 +59,7 @@ ExternalProject_Add(external_opencolorio
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH MD5=${OPENCOLORIO_HASH}
   PREFIX ${BUILD_DIR}/opencolorio
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/opencolorio
 )
-- 
cgit v1.2.3