From 34721e14920080e6f8dc91cdd33eed40d7537087 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 28 Jan 2024 12:55:22 +0000 Subject: [PATCH] imath: update to 3.1.10. ## Version 3.1.10 (January 26, 2024) Patch release with various build/bug fixes. Build fixes: - Fix a problem where downstream projects using Imath would build python bindings even if they weren't requested. - Fix for missing `std::bit_cast` - Fix missing/necessary use of IMATH_HOSTDEVICE - IMATH_INSTALL_PKG_CONFIG is now on by default, even on Windows - Fix calling default constructor by uniform init in TypeTraits - Fix redundant PYIMATH_EXPORTS causing compile issues on Windows Clang - Update to SO versioning policy: This change adopts a policy of appending the ``MAJOR.MINOR.PATCH`` software release name to the ``SONAME`` to form the real name of the shared library. See [website/install.rst](website/install.rst) and [PR #339](https://github.com/AcademySoftwareFoundation/openexr/pull/339) for more details. Bug fixes: - Fix half to float giving wrong results on older x86_64 CPUs on Windows Other changes: - succ()/pred() now use std::nextafter(). - Expand epsilon bounds for m44x pyImath test. - Rename "docs" to "website". - Add missing copyright/license identifiers. ### Merged Pull Requests * \[[#363](https://github.com/AcademySoftwareFoundation/Imath/pull/363)\] Update install instructions to reflect new SO versioning policy * \[[#362](https://github.com/AcademySoftwareFoundation/Imath/pull/362)\] Require sphinx 5.0 * \[[#361](https://github.com/AcademySoftwareFoundation/Imath/pull/361)\] src/python/config/ModuleDefine.cmake: do not install a cmake file exporting targets for dependent projects * \[[#358](https://github.com/AcademySoftwareFoundation/Imath/pull/358)\] Fix half to float giving wrong results on older x86_64 CPUs on Windows * \[[#353](https://github.com/AcademySoftwareFoundation/Imath/pull/353)\] Changed implementation of succ and pred to use std::nextafter. * \[[#350](https://github.com/AcademySoftwareFoundation/Imath/pull/350)\] Fix check for the availability of std::bit_cast * \[[#349](https://github.com/AcademySoftwareFoundation/Imath/pull/349)\] IMATH_INSTALL_PKG_CONFIG is on by default, even on Windows * \[[#347](https://github.com/AcademySoftwareFoundation/Imath/pull/347)\] Export Imath from the build tree and so on. * \[[#344](https://github.com/AcademySoftwareFoundation/Imath/pull/344)\] rm unnecessary IMATH_HOSTDEVICE attributes. * \[[#342](https://github.com/AcademySoftwareFoundation/Imath/pull/342)\] Add missing copyright/license identifiers * \[[#341](https://github.com/AcademySoftwareFoundation/Imath/pull/341)\] Remove unnecessary files * \[[#340](https://github.com/AcademySoftwareFoundation/Imath/pull/340)\] Fix calling default constructor by uniform init. * \[[#339](https://github.com/AcademySoftwareFoundation/Imath/pull/339)\] Update and simply SO versioning policy * \[[#338](https://github.com/AcademySoftwareFoundation/Imath/pull/338)\] Rename "docs" to "website" * \[[#333](https://github.com/AcademySoftwareFoundation/Imath/pull/333)\] Expand epsilon bounds for m44x pyImath test * \[[#331](https://github.com/AcademySoftwareFoundation/Imath/pull/331)\] Fixed redundant PYIMATH_EXPORTS causing compile issues on Windows Clang * \[[#326](https://github.com/AcademySoftwareFoundation/Imath/pull/326)\] Use security@openexr.com for consistency * \[[#320](https://github.com/AcademySoftwareFoundation/Imath/pull/320)\] Add missing IMATH_HOSTDEVICE to Matrix33::invert(bool) --- math/imath/Makefile | 4 +- math/imath/PLIST | 4 +- math/imath/distinfo | 9 +++-- .../patches/patch-src_Imath_ImathFun.cpp | 40 +++++++++++++++++++ 4 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 math/imath/patches/patch-src_Imath_ImathFun.cpp diff --git a/math/imath/Makefile b/math/imath/Makefile index cd40efd038c2..5d66f97acadb 100644 --- a/math/imath/Makefile +++ b/math/imath/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2023/07/18 18:30:01 nia Exp $ +# $NetBSD: Makefile,v 1.11 2024/01/28 12:55:22 wiz Exp $ -DISTNAME= imath-3.1.9 +DISTNAME= imath-3.1.10 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/} GITHUB_PROJECT= Imath diff --git a/math/imath/PLIST b/math/imath/PLIST index 0350f80e7eb5..bf552c405260 100644 --- a/math/imath/PLIST +++ b/math/imath/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2023/06/06 08:01:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2024/01/28 12:55:22 wiz Exp $ include/Imath/ImathBox.h include/Imath/ImathBoxAlgo.h include/Imath/ImathColor.h @@ -40,6 +40,6 @@ lib/cmake/Imath/ImathTargets-release.cmake lib/cmake/Imath/ImathTargets.cmake lib/libImath-3_1.so lib/libImath-3_1.so.29 -lib/libImath-3_1.so.29.8.0 +lib/libImath-3_1.so.29.9.0 lib/libImath.so lib/pkgconfig/Imath.pc diff --git a/math/imath/distinfo b/math/imath/distinfo index 77a1a07d796e..6561597224ae 100644 --- a/math/imath/distinfo +++ b/math/imath/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10 2023/06/06 08:01:09 wiz Exp $ +$NetBSD: distinfo,v 1.11 2024/01/28 12:55:22 wiz Exp $ -BLAKE2s (imath-3.1.9.tar.gz) = 3e37b4e025ce132b6bf9ab085751f294581e532c0097701493cea0c38719d00a -SHA512 (imath-3.1.9.tar.gz) = ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564 -Size (imath-3.1.9.tar.gz) = 598497 bytes +BLAKE2s (imath-3.1.10.tar.gz) = 5aaf7d6b85a92c25bf1e539f4cc4ee1bbe3efc18efbe58b84f52c30cc159f8b3 +SHA512 (imath-3.1.10.tar.gz) = 6a5bcb3f31880edd266c7c5d757ce233e91dad4007f4c411c06a58494ca64517a3df22fd3491837bb8ac211c4c5f8ee679b68c0fbcf9c31c8f2d7c7bb9d253e8 +Size (imath-3.1.10.tar.gz) = 595059 bytes +SHA1 (patch-src_Imath_ImathFun.cpp) = e85edd2fc1dd2dd5e5d799570de308aa5a12faef diff --git a/math/imath/patches/patch-src_Imath_ImathFun.cpp b/math/imath/patches/patch-src_Imath_ImathFun.cpp new file mode 100644 index 000000000000..92972e5ccf71 --- /dev/null +++ b/math/imath/patches/patch-src_Imath_ImathFun.cpp @@ -0,0 +1,40 @@ +$NetBSD: patch-src_Imath_ImathFun.cpp,v 1.1 2024/01/28 12:55:22 wiz Exp $ + +src/Imath/ImathFun.cpp: In function 'float Imath_3_1::succf(float)': +src/Imath/ImathFun.cpp:13:12: error: 'isfinite' was not declared in this scope; did you mean 'std::isfinite'? + 13 | return isfinite(f) ? + | ^~~~~~~~ + | std::isfinite + +--- src/Imath/ImathFun.cpp.orig 2024-01-28 12:53:28.995862273 +0000 ++++ src/Imath/ImathFun.cpp +@@ -10,25 +10,25 @@ IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER + + float succf(float f) IMATH_NOEXCEPT + { +- return isfinite(f) ? ++ return std::isfinite(f) ? + std::nextafter(f, std::numeric_limits::infinity()) : f; + } + + float predf(float f) IMATH_NOEXCEPT + { +- return isfinite(f) ? ++ return std::isfinite(f) ? + std::nextafter(f, -std::numeric_limits::infinity()) : f; + } + + double succd(double d) IMATH_NOEXCEPT + { +- return isfinite(d) ? ++ return std::isfinite(d) ? + std::nextafter(d, std::numeric_limits::infinity()) : d; + } + + double predd(double d) IMATH_NOEXCEPT + { +- return isfinite(d) ? ++ return std::isfinite(d) ? + std::nextafter(d, -std::numeric_limits::infinity()) : d; + } +