From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7AB8158041 for ; Fri, 8 Mar 2024 18:34:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91D16E29DA; Fri, 8 Mar 2024 18:34:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F39CCE29DA for ; Fri, 8 Mar 2024 18:34:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32A3333BE19 for ; Fri, 8 Mar 2024 18:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 572FA137F for ; Fri, 8 Mar 2024 18:34:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1709922844.57202035b4521bf73359b43498fd4a735760c88b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openexr/files/openexr-3.1.7-musl-i386.patch media-libs/openexr/openexr-3.1.7.ebuild X-VCS-Directories: media-libs/openexr/ media-libs/openexr/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 57202035b4521bf73359b43498fd4a735760c88b X-VCS-Branch: master Date: Fri, 8 Mar 2024 18:34:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4c675d9-65a8-4ea1-990e-c87ed3124e46 X-Archives-Hash: cdb09fa6326c57bb7ff5a388a0959ce5 commit: 57202035b4521bf73359b43498fd4a735760c88b Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Mon Apr 10 17:23:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 8 18:34:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57202035 media-libs/openexr: fix x86 musl build for version 3.1.7 Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Closes: https://github.com/gentoo/gentoo/pull/30542 Signed-off-by: Sam James gentoo.org> .../openexr/files/openexr-3.1.7-musl-i386.patch | 19 +++++++++++++++++++ media-libs/openexr/openexr-3.1.7.ebuild | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch new file mode 100644 index 000000000000..e2bedf6e7a12 --- /dev/null +++ b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch @@ -0,0 +1,19 @@ +--- a/src/lib/Iex/IexMathFpu.cpp ++++ b/src/lib/Iex/IexMathFpu.cpp +@@ -251,14 +251,14 @@ + inline void + restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) + { +-# if (defined(__GLIBC__) && defined(__i386__)) || defined(__ANDROID_API__) ++# if (defined(__linux__) && defined(__i386__)) || defined(__ANDROID_API__) + 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__) ++# if defined(__linux__) && defined(__i386__) + setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); + #else + setMxcsr (kfp->mxcsr, clearExceptions); diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild index e3960f74c307..cedfef02a75b 100644 --- a/media-libs/openexr/openexr-3.1.7.ebuild +++ b/media-libs/openexr/openexr-3.1.7.ebuild @@ -25,7 +25,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch + "${FILESDIR}"/${PN}-3.1.7-musl-i386.patch +) + DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) src_prepare() {