From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- media-libs/ilmbase/Manifest | 7 +--- media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 ----------------------- media-libs/ilmbase/ilmbase-2.5.2.ebuild | 49 ---------------------- media-libs/ilmbase/ilmbase-2.5.4.ebuild | 42 ------------------- media-libs/ilmbase/ilmbase-2.5.5.ebuild | 2 +- 5 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch delete mode 100644 media-libs/ilmbase/ilmbase-2.5.2.ebuild delete mode 100644 media-libs/ilmbase/ilmbase-2.5.4.ebuild (limited to 'media-libs/ilmbase') diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index 3717c7252169..e5298c68d6c8 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,13 +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 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.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab -DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1 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.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363 -EBUILD ilmbase-2.5.4.ebuild 1067 BLAKE2B e67250c33c6a71e67868382cd1348bcde9b6d0e033b0c8db4058d19c4b93505ebb52fee00ada46d7a651764144b94e415a20c7b7a11eb4ec7b2f28f491acb6dc SHA512 787d029ece0615e6e7d3ab32d78d9b9229e70c2bb2a743bf063ccf0ee238e4300074c0d73210ea432fc86a04ea6a74c8293c3e3978b3a68d8632380ae670da02 -EBUILD ilmbase-2.5.5.ebuild 1076 BLAKE2B 9e8c0f76dea3230d17b096fa3661a8ea4281061e80dad43d5763da19de578ecd9ddfffdf80758a5a9ef55b35c63f1c29110811b777af86317c84d5c5f6a3cd4d SHA512 154a92f3d3a1f1cbbb537af9e36a65048283d0955c79fa90fdd0773a6a8b9984fcea102854a06d02a0097fbe58f3e59cc486fcffd759506c61bd02bf1d226a3a +EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001 MISC metadata.xml 661 BLAKE2B 3392b45aa602d98cd1f9403766c7829cc2744893629489e267d2a6c568a5d934114012f8b6ec84acda5bd42f06c3b2ebad8bf25cb540a27b80485696c82c7469 SHA512 6a0773377471b23316f73e7aba924a7421432a1d75da858354c72685eb6602cce7c7e16a5232ca47df3d8f9f3465f1bc5c1f58259733fcdfaeeeaa2b0327bdef diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch deleted file mode 100644 index 80f11e44c12e..000000000000 --- a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index f2e753877179..000000000000 --- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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/ilmbase-2.5.4.ebuild b/media-libs/ilmbase/ilmbase-2.5.4.ebuild deleted file mode 100644 index f840cd379ffb..000000000000 --- a/media-libs/ilmbase/ilmbase-2.5.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 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="https://www.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" - -DOCS=( README.md ) - -src_prepare() { - if use abi_x86_32; then - eapply "${FILESDIR}"/${P}-0001-disable-failing-test-on-x86_32.patch - fi - - multilib_foreach_abi cmake_src_prepare -} - -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 - ) - - cmake_src_configure -} diff --git a/media-libs/ilmbase/ilmbase-2.5.5.ebuild b/media-libs/ilmbase/ilmbase-2.5.5.ebuild index c8c99d2fd039..3575c02a3284 100644 --- a/media-libs/ilmbase/ilmbase-2.5.5.ebuild +++ b/media-libs/ilmbase/ilmbase-2.5.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar 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" +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 )" -- cgit v1.2.3