openexr: Bump to 3.1.6

This commit is contained in:
Tee KOBAYASHI 2023-03-10 16:17:45 +09:00 committed by xtkoba
parent 9720b39fc3
commit b970e4e10f
3 changed files with 24 additions and 21 deletions

View File

@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Provides the specification and reference implementation
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
# Align the version with `imath` package.
TERMUX_PKG_VERSION=3.1.5
TERMUX_PKG_VERSION=3.1.6
TERMUX_PKG_SRCURL=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
TERMUX_PKG_SHA256=daa33d93a7b706e27368a162060df0246a7750c39a01a122d33b13f5c45d2029
TERMUX_PKG_DEPENDS="imath (>= ${TERMUX_PKG_VERSION}), libc++, zlib"
TERMUX_PKG_CONFLICTS="openexr2"
TERMUX_PKG_REPLACES="openexr2"

View File

@ -0,0 +1,22 @@
--- a/src/lib/OpenEXR/ImfSimd.h
+++ b/src/lib/OpenEXR/ImfSimd.h
@@ -43,7 +43,7 @@
#define IMF_HAVE_F16C 1
#endif
-#if defined(__ARM_NEON)
+#if defined(__ARM_NEON) && defined(__aarch64__)
# define IMF_HAVE_NEON
#endif
--- a/src/lib/OpenEXRCore/internal_zip.c
+++ b/src/lib/OpenEXRCore/internal_zip.c
@@ -24,7 +24,7 @@
# define IMF_HAVE_SSE4_1 1
# include <smmintrin.h>
#endif
-#if defined(__ARM_NEON)
+#if defined(__ARM_NEON) && defined(__aarch64__)
# define IMF_HAVE_NEON 1
# include <arm_neon.h>
#endif

View File

@ -1,19 +0,0 @@
--- a/src/lib/Iex/IexMathFpu.cpp
+++ b/src/lib/Iex/IexMathFpu.cpp
@@ -251,14 +251,14 @@
inline void
restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
{
-# if defined(__GLIBC__) && defined(__i386__)
+# if (defined(__GLIBC__) || defined(__ANDROID__)) && defined(__i386__)
setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
#else
setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
# endif
_fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
-# if defined(__GLIBC__) && defined(__i386__)
+# if (defined(__GLIBC__) || defined(__ANDROID__)) && defined(__i386__)
setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
#else
setMxcsr (kfp->mxcsr, clearExceptions);