deps_builder: include OIIO PR #4062
OIIO was including imaths half.h when it did not need to, leading to build errors in lite builds. This issue had been fixed already upstream but was not yet included in the version we use.
This commit is contained in:
parent
2824e45678
commit
fcbb94ed1e
@ -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
|
||||
)
|
||||
|
28
build_files/build_environment/patches/oiio_4062.diff
Normal file
28
build_files/build_environment/patches/oiio_4062.diff
Normal file
@ -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 <OpenImageIO/detail/fmt.h>
|
||||
|
||||
-// Without SSE, we need to fall back on Imath for matrix44 invert
|
||||
-#if !OIIO_SIMD_SSE
|
||||
-# include <OpenImageIO/Imath.h>
|
||||
-#endif
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
@@ -279,6 +275,12 @@
|
||||
#endif
|
||||
|
||||
|
||||
+// Without SSE, we need to fall back on Imath for matrix44 invert
|
||||
+#if !OIIO_SIMD_SSE
|
||||
+# include <OpenImageIO/Imath.h>
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
OIIO_NAMESPACE_BEGIN
|
||||
|
||||
namespace simd {
|
Loading…
Reference in New Issue
Block a user