From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-libs/ilmbase/Manifest | 4 - .../ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch | 214 --------------------- .../ilmbase/files/ilmbase-2.3.0-testBox.patch | 104 ---------- media-libs/ilmbase/ilmbase-2.3.0.ebuild | 40 ---- 4 files changed, 362 deletions(-) delete mode 100644 media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch delete mode 100644 media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch delete mode 100644 media-libs/ilmbase/ilmbase-2.3.0.ebuild (limited to 'media-libs/ilmbase') diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index 505bf5145c21..3e4e53978a2c 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,8 +1,4 @@ -AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b -AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b -DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf -EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6 diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch deleted file mode 100644 index 214285293910..000000000000 --- a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch +++ /dev/null @@ -1,214 +0,0 @@ ---- a/configure -+++ b/configure -@@ -15253,7 +15253,7 @@ else - fi - - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - ax_cxx_compile_alternatives="17 1z" ax_cxx_compile_cxx17_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not - - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde - - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' -@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde - - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h - - CXXFLAGS="$CXXFLAGS -std=c++03" -@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5 - $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;} - -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -22768,7 +22768,7 @@ LIB_SUFFIX="" - lib_suffix_valid="no" - - lib_namespace="" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - cat >>confdefs.h <<_ACEOF - #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API} - _ACEOF -@@ -22787,7 +22787,7 @@ _ACEOF - lib_namespace="${ILMBASE_VERSION_API}" - LIB_SUFFIX="${ILMBASE_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - cat >>confdefs.h <<_ACEOF - #define IMATH_INTERNAL_NAMESPACE Imath - _ACEOF -@@ -22823,7 +22823,7 @@ _ACEOF - fi - - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - LIB_SUFFIX_DASH="-${LIB_SUFFIX}" - - if true; then -@@ -22858,7 +22858,7 @@ else - fi - - --if test "x${custom_public_namespace}" == xyes ; then -+if test "x${custom_public_namespace}" = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5 - $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;} - $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h -@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus - - public_namespace="" - custom_public_namespace=no --elif test "x${custom_public_namespace}" == xno ; then -+elif test "x${custom_public_namespace}" = xno ; then - $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h - - $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h -@@ -22912,12 +22912,11 @@ fi - - - if test "${osx_arch}" != default ; then -- osx_arch_flags="-arch ${osx_arch// / -arch }" -+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch}) - CXXFLAGS="$CXXFLAGS $osx_arch_flags" - - if test "$enable_dependency_tracking" != no ; then -- osx_arch_array=( ${osx_arch} ) -- if test ${#osx_arch_array[@]} -gt 1 ; then -+ if echo "$osx_arch" | grep >/dev/null " " ; then - as_fn_error $? "building multiple OS X architectures requires --disable-dependency-tracking. - Please re-run configure with these options: - --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking ---- a/configure.ac -+++ b/configure.ac -@@ -45,19 +45,19 @@ AC_ARG_ENABLE(cxxstd, - [enable ISO c++ standard 11/14 [[default=auto]]]), - [cxxstd="${enableval}"], [cxxstd=14]) - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - AC_DEFINE(ILMBASE_FORCE_CXX03) - CXXFLAGS="$CXXFLAGS -std=c++03" - else -@@ -65,11 +65,11 @@ else - AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([14], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([17], [noext], [optional]) -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -212,7 +212,7 @@ lib_suffix_valid="no" - dnl Internal library namespace - dnl - lib_namespace="" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE, Imath_${ILMBASE_VERSION_API}) - AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex_${ILMBASE_VERSION_API}) - AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread_${ILMBASE_VERSION_API}) -@@ -221,7 +221,7 @@ if test "x${library_namespace_versioning - lib_namespace="${ILMBASE_VERSION_API}" - LIB_SUFFIX="${ILMBASE_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE, Imath) - AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex) - AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread) -@@ -238,7 +238,7 @@ else - fi - AC_SUBST(LIB_SUFFIX) - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}") - AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true) - else -@@ -257,7 +257,7 @@ AC_ARG_ENABLE(customusernamespace, - [custom_public_namespace="${enableval}"], - [custom_public_namespace=no]) - --if test "x${custom_public_namespace}" == xyes ; then -+if test "x${custom_public_namespace}" = xyes ; then - AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to default]) - AC_DEFINE(IMATH_NAMESPACE, Imath) - AC_DEFINE(IEX_NAMESPACE, Iex) -@@ -265,7 +265,7 @@ if test "x${custom_public_namespace}" == - - public_namespace="" - custom_public_namespace=no --elif test "x${custom_public_namespace}" == xno ; then -+elif test "x${custom_public_namespace}" = xno ; then - AC_DEFINE(IMATH_NAMESPACE, Imath) - AC_DEFINE(IEX_NAMESPACE, Iex) - AC_DEFINE(ILMTHREAD_NAMESPACE, IlmThread) -@@ -296,14 +296,12 @@ case "$host" in - [osx_arch="${enableval}"], [osx_arch=default]) - - if test "${osx_arch}" != default ; then -- dnl Replace "a b c" with "-arch a -arch b -arch c". Should probably use an all-whitespace regexp rather than a single character for the search string. -- osx_arch_flags="-arch ${osx_arch// / -arch }" -+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch}) - CXXFLAGS="$CXXFLAGS $osx_arch_flags" - - dnl If multiple archs specified, make sure that --disable-dependency-tracking was also specified - if test "$enable_dependency_tracking" != no ; then -- osx_arch_array=( ${osx_arch} ) -- if test ${#osx_arch_array[@]} -gt 1 ; then -+ if echo "$osx_arch" | grep >/dev/null " " ; then - AC_MSG_ERROR([building multiple OS X architectures requires --disable-dependency-tracking. - Please re-run configure with these options: - --enable-osx-arch="${osx_arch}" --disable-dependency-tracking diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch deleted file mode 100644 index 8211846b09b6..000000000000 --- a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch +++ /dev/null @@ -1,104 +0,0 @@ -Subject: testBox: allow fuzzy comparison of floats, doubles -From: Steven Chamberlain -Date: Wed, 24 Feb 2016 01:10:11 +0000 - -Allow for inexact values, as long as the error is smaller than the -epsilon of the data type. - -On 32-bit x86, allow even greater discrepency at double -precision, due to possible double-rounding. See -https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html - -Index: ilmbase/ImathTest/testBox.cpp -=================================================================== ---- ilmbase.orig/ImathTest/testBox.cpp -+++ ilmbase/ImathTest/testBox.cpp -@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE - - namespace { - -+template -+bool -+approximatelyEqual (const T &p1, const T &p2) -+{ -+ /* int and short should be exact */ -+ return (p1 == p2); -+} -+ -+bool -+approximatelyEqual (const Vec2 &p1, const Vec2 &p2) -+{ -+ float e = limits::epsilon(); -+ float m = 0; -+ -+ for (int i = 0; i < 2; ++i) -+ { -+ m = max (m, abs (p1[i])); -+ m = max (m, abs (p2[i])); -+ } -+ -+ for (int i = 0; i < 2; ++i) -+ if (!equalWithAbsError (p1[i], p2[i], m * e)) -+ return false; -+ -+ return true; -+} -+ -+bool -+approximatelyEqual (const Vec2 &p1, const Vec2 &p2) -+{ -+#if defined(__i386__) || defined(_M_IX86) -+ /* double-rounding on 32-bit x86 may cause larger error: -+ use epsilon of float rather than double */ -+ double e = limits::epsilon(); -+#else -+ double e = limits::epsilon(); -+#endif -+ double m = 0; -+ -+ for (int i = 0; i < 2; ++i) -+ { -+ m = max (m, abs (p1[i])); -+ m = max (m, abs (p2[i])); -+ } -+ -+ for (int i = 0; i < 2; ++i) -+ if (!equalWithAbsError (p1[i], p2[i], m * e)) -+ return false; -+ -+ return true; -+} -+ - // - // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4} - // with all permutations of integers 1..T::dimensions(). -@@ -250,7 +302,8 @@ testExtendByPoint(const char *type) - - IMATH_INTERNAL_NAMESPACE::Box b; - b.extendBy(p); -- assert(b.min == p && b.max == p); -+ assert (approximatelyEqual (b.min, p)); -+ assert (approximatelyEqual (b.max, p)); - } - - // -@@ -283,7 +336,8 @@ testExtendByPoint(const char *type) - - b.extendBy(p); - -- assert(b.min == min && b.max == max); -+ assert (approximatelyEqual (b.min, min)); -+ assert (approximatelyEqual (b.max, max)); - } - } - } -@@ -358,7 +412,8 @@ testExtendByBox(const char *type) - } - b.extendBy(IMATH_INTERNAL_NAMESPACE::Box(p0, p1)); - -- assert(b.min == min && b.max == max); -+ assert (approximatelyEqual (b.min, min)); -+ assert (approximatelyEqual (b.max, max)); - } - } - } diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild deleted file mode 100644 index e994e236f280..000000000000 --- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib-minimal - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/" -SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/24" # based on SONAME -KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.0-testBox.patch - "${FILESDIR}"/${PN}-2.3.0-fix-bashisms.patch -) - -DOCS=( AUTHORS ChangeLog NEWS README.md ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) - -multilib_src_configure() { - # Disable use of ucontext.h wrt #482890 - if use hppa || use ppc || use ppc64; then - export ac_cv_header_ucontext_h=no - fi - - ECONF_SOURCE=${S} econf "$(use_enable static-libs static)" -} - -multilib_src_install_all() { - einstalldocs - - # package provides pkg-config files - find "${D}" -name '*.la' -delete || die -} -- cgit v1.2.3