diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 6638d24c565..b85eb29011f 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -110,7 +110,8 @@ ExternalProject_Add(external_openimageio PREFIX ${BUILD_DIR}/openimageio PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff && ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_webp.diff && - ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_4044.diff + ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_4044.diff && + ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_4062.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openimageio ) diff --git a/build_files/build_environment/patches/oiio_4062.diff b/build_files/build_environment/patches/oiio_4062.diff new file mode 100644 index 00000000000..7f5fd33ff42 --- /dev/null +++ b/build_files/build_environment/patches/oiio_4062.diff @@ -0,0 +1,28 @@ +diff --git a/src/include/OpenImageIO/simd.h b/src/include/OpenImageIO/simd.h +index f888b29fe..e0cdebdc1 100644 +--- a/src/include/OpenImageIO/simd.h ++++ b/src/include/OpenImageIO/simd.h +@@ -46,10 +46,6 @@ + + #include + +-// Without SSE, we need to fall back on Imath for matrix44 invert +-#if !OIIO_SIMD_SSE +-# include +-#endif + + + ////////////////////////////////////////////////////////////////////////// +@@ -279,6 +275,12 @@ + #endif + + ++// Without SSE, we need to fall back on Imath for matrix44 invert ++#if !OIIO_SIMD_SSE ++# include ++#endif ++ ++ + OIIO_NAMESPACE_BEGIN + + namespace simd {