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.

3 files changed, 16 insertions, 85 deletions

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
 )
diff --git a/build_files/build_environment/patches/opencolorio.diff b/build_files/build_environment/patches/opencolorio.diff
index c76c62c1057..2255cbc02ed 100644
--- a/build_files/build_environment/patches/opencolorio.diff
+++ b/build_files/build_environment/patches/opencolorio.diff
@@ -1,33 +1,16 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
-     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
---- a/CMakeLists.txt	2018-09-10 22:15:29.000000000 +0200
-+++ b/CMakeLists.txt	2018-09-10 22:17:40.000000000 +0200
-@@ -229,7 +229,7 @@
-             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${TINYXML_PATCHFILE}
-             BINARY_DIR      ext/build/tinyxml
-             INSTALL_DIR     ext/dist
--            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS}
-+            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake
+index 7b894a45..92618215 100644
+--- a/share/cmake/modules/Findpystring.cmake
++++ b/share/cmake/modules/Findpystring.cmake
+@@ -113,6 +113,11 @@ if(NOT pystring_FOUND)
+             -DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
+             -DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
+             -DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
++            -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
++            -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
++            -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
++            -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
++            -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
          )
-         if(WIN32)
-             set(TINYXML_STATIC_LIBRARIES  ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
-@@ -343,7 +343,7 @@
-             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${YAML_CPP_PATCHFILE}
-             BINARY_DIR      ext/build/yaml-cpp
-             INSTALL_DIR     ext/dist
--            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS}
-+            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-         )
-         set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
-         set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
+         if(CMAKE_TOOLCHAIN_FILE)
+             set(pystring_CMAKE_ARGS
diff --git a/build_files/build_environment/patches/opencolorio_win.diff b/build_files/build_environment/patches/opencolorio_win.diff
deleted file mode 100644
index eb65411b61a..00000000000
--- a/build_files/build_environment/patches/opencolorio_win.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur external_opencolorio/CMakeLists.txt external_opencolorio.patched/CMakeLists.txt
---- external_opencolorio/CMakeLists.txt	2018-01-04 18:38:27 -0700
-+++ external_opencolorio.patched/CMakeLists.txt	2018-08-15 11:46:53 -0600
-@@ -251,25 +251,30 @@
- if(USE_EXTERNAL_YAML)
-     # Set minimum yaml version for non-patched sources.
-     set(YAML_VERSION_MIN "0.3.0")
--    include(FindPkgConfig)
--    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
--    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
--        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
--    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
--        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
--    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
--    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
--    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
-+    if(NOT WIN32)
-+		include(FindPkgConfig)
-+		pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-+		find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-+			HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
-+		find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
-+			HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
-+		set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
-+		set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+		set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
- 
--    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
--        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
--    endif()
--
--    find_package_handle_standard_args(yaml-cpp
--                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
--    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
--    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+		if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
-+			message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
-+		endif()
- 
-+		find_package_handle_standard_args(yaml-cpp
-+										  REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
-+		set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
-+		mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+	else()
-+		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_1})
-+		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_2})
-+		message("INCLUDE DIRS = i:${EXTERNAL_INCLUDE_DIRS} |1:${INC_1} |2:${INC_2}")
-+	endif()
-     if(YAML_CPP_FOUND)
-         if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.