griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build: Add patch to OIIO fixing Windows ARM64 + clang

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/126331
This commit is contained in:
Anthony Roberts
2024-08-14 19:25:56 +01:00
committed by Gitea
parent cfe69e32bc
commit 37e86dbf6f
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/build_environment/cmake/openimageio.cmake
View File

@@ -142,7 +142,10 @@ ExternalProject_Add(external_openimageio
${PATCH_DIR}/oiio_4062.diff &&
${PATCH_CMD} -p 1 -N -d
${BUILD_DIR}/openimageio/src/external_openimageio/ <
${PATCH_DIR}/oiio_4302.diff
${PATCH_DIR}/oiio_4302.diff &&
${PATCH_CMD} -p 1 -N -d
${BUILD_DIR}/openimageio/src/external_openimageio/ <
${PATCH_DIR}/oiio_windows_arm64.diff
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio
${DEFAULT_CMAKE_FLAGS}

14
build_files/build_environment/patches/oiio_windows_arm64.diff Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/src/include/OpenImageIO/simd.h b/src/include/OpenImageIO/simd.h
index b1701946f..d148a89d3 100644
--- a/src/include/OpenImageIO/simd.h
+++ b/src/include/OpenImageIO/simd.h
@@ -119,6 +119,9 @@
// Cuda -- don't include any of these headers
#elif defined(_WIN32)
# include <intrin.h>
+# if defined(__ARM_NEON__) && !defined(OIIO_NO_NEON)
+# include <arm_neon.h>
+# endif
#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) || defined(__e2k__)
# include <x86intrin.h>
#elif defined(__GNUC__) && defined(__ARM_NEON__) && !defined(OIIO_NO_NEON)