openexr: update to 3.1.5; adopt.

This commit is contained in:
André Cerqueira 2022-10-10 20:14:40 +01:00 committed by John
parent 4accc1948d
commit 342a02795a
4 changed files with 17 additions and 58 deletions

View file

@ -4217,3 +4217,8 @@ libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
libbpf.so.1 libbpf-1.0.0_1
libImath-3_1.so.29 imath-3.1.5_1
libIex-3_1.so.30 libopenexr-3.1.5_1
libIlmThread-3_1.so.30 libopenexr-3.1.5_1
libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1

View file

@ -1,21 +0,0 @@
--- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
@@ -281,10 +281,18 @@
inline void
restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
{
+#if defined(__GLIBC__) || 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__)
setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+#else
+ setMxcsr (kfp->mxcsr, clearExceptions);
+#endif
}
#endif

View file

@ -1,15 +0,0 @@
--- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
@@ -6,8 +6,8 @@
prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-OpenEXR_includedir=@includedir@/OpenEXR
+exec_prefix=${prefix}/@exec_prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
libsuffix=@LIB_SUFFIX_DASH@
Name: OpenEXR

View file

@ -1,38 +1,28 @@
# Template file for 'openexr'
pkgname=openexr
version=2.4.1
revision=2
version=3.1.5
revision=1
build_style=cmake
build_helper="qemu"
hostmakedepends="pkg-config"
makedepends="ilmbase-devel zlib-devel"
makedepends="zlib-devel imath-devel"
short_desc="High dynamic-range (HDR) image file format"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.openexr.com/"
changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i IlmBase/Half/CMakeLists.txt \
IlmBase/ImathTest/CMakeLists.txt \
OpenEXR/IlmImf/CMakeLists.txt \
-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
fi
}
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
then
make_check=no # Test Fails in i868
# See upstream:
# https://github.com/AcademySoftwareFoundation/openexr/issues/876
fi
post_install() {
local d f
vlicense LICENSE.md
# Remove files which are already in ilmbase{,-devel}
for pkg in ilmbase ilmbase-devel; do
for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
rm -f "${DESTDIR}/$f"
done
done
}
libopenexr_package() {