From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-libs/ilmbase/Manifest | 5 ++- media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 +++++++++++++++++++++++ media-libs/ilmbase/ilmbase-2.5.2.ebuild | 49 ++++++++++++++++++++++ media-libs/ilmbase/metadata.xml | 15 ++++++- 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch create mode 100644 media-libs/ilmbase/ilmbase-2.5.2.ebuild (limited to 'media-libs/ilmbase') diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index e6c75520cef4..0762be6fd09a 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,5 +1,8 @@ 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.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a +DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290 -MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca +EBUILD ilmbase-2.5.2.ebuild 1328 BLAKE2B d155d7586a8a6bce9f95727a7176919ab3363fcaef6bf67893a81228723b6b3474255d8814666138d85f9c4ce162699b392909ced91cfff077a12fde770b3648 SHA512 5e56f93bb7853c8dfa8bed4819e5db15f50a5541a3dfcf949227ba7434f6647659e55b230be6b84819e3f73c3ce00d677770735f875bd592c9f57e6e7e7ef4da +MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2 diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch new file mode 100644 index 000000000000..80f11e44c12e --- /dev/null +++ b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch @@ -0,0 +1,50 @@ +From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Thu, 30 Jul 2020 02:21:07 +0200 +Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Originally from: +https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch + +Fixes error: + + IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’: + IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’? + 284 | setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); + | ^~ + | cwd + IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’ + 287 | setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); + | ^~~~~ + +Signed-off-by: Niklas Hambüchen +--- + IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp +index ceed658e0..439329e50 100644 +--- a/IexMath/IexMathFpu.cpp ++++ b/IexMath/IexMathFpu.cpp +@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) + 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 diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild new file mode 100644 index 000000000000..3e9e28c44118 --- /dev/null +++ b/media-libs/ilmbase/ilmbase-2.5.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib flag-o-matic + +DESCRIPTION="OpenEXR ILM Base libraries" +HOMEPAGE="http://openexr.com/" +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/25" # based on SONAME +KEYWORDS="amd64 -arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="large-stack static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/openexr-${PV}/IlmBase" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h ) + +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) + -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack) + -DILMBASE_INSTALL_PKG_CONFIG=ON + ) + + # Disable use of ucontext.h wrt #482890 + if use hppa || use ppc || use ppc64; then + mycmakeargs+=( + -DILMBASE_HAVE_UCONTEXT_H=OFF + ) + fi + + # needed for running tests with x86_32 + # see https://github.com/AcademySoftwareFoundation/openexr/issues/346 + if use abi_x86_32 && use test; then + append-cppflags -ffloat-store + fi + + cmake_src_configure +} diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml index fc9e500d69e1..454b3da09a54 100644 --- a/media-libs/ilmbase/metadata.xml +++ b/media-libs/ilmbase/metadata.xml @@ -1,10 +1,23 @@ + + waebbl@gmail.com + Bernd Waibel + + + proxy-maint@gentoo.org + Proxy Maintainers + media-video@gentoo.org + + + Enables code to take advantage of large stack support + + - openexr/openexr + AcademySoftwareFoundation/openexr -- cgit v1.2.3