From 8edd4a48a39640822abe6ddb7b2a1d5b2da4ea70 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Mar 2024 19:07:58 +0000 Subject: gentoo auto-resync : 08:03:2024 - 19:07:58 --- media-libs/openexr/Manifest | 6 ++++-- .../openexr/files/openexr-3.1.5-musl-i386.patch | 19 +++++++++++++++++++ .../openexr/files/openexr-3.1.7-musl-i386.patch | 19 +++++++++++++++++++ media-libs/openexr/openexr-3.1.5-r1.ebuild | 1 + media-libs/openexr/openexr-3.1.7.ebuild | 6 +++++- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 media-libs/openexr/files/openexr-3.1.5-musl-i386.patch create mode 100644 media-libs/openexr/files/openexr-3.1.7-musl-i386.patch (limited to 'media-libs/openexr') diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index cf8aa2a87205..4c8bdb2733da 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -2,6 +2,8 @@ AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278 AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f +AUX openexr-3.1.5-musl-i386.patch 755 BLAKE2B 0a32fd9f317aea7bc96608137ab8953d75bedd9813b7b8b2bde86acab9ba4624bb359efa3d9fa1c67891d91c12579a1fe36b38f64ed89c538fa38cc2b242b319 SHA512 a33110c648ec58513b420e9d40aeaf350f55bd9712b95e0fbca43c2cc11042c77a10d67714d7b403f1dd0d096e92bd1ab4548027b24682db48e5bb6ece5f88ad +AUX openexr-3.1.7-musl-i386.patch 815 BLAKE2B c969001a289711427465cdc75977d8a554409e62ddd4a958b2363c22fbaf18cb10a7d11f03b5e3caee3476b7f325581a51092432f2490696d79794b9abb339f6 SHA512 abae9dbe6858c6384ae1ed373267d4cc6eb1d6458e48d282e612ef216a2cce6805e7f7e2cd7faa9daf36a12b6d93b5c18b78d2bd5eee9cfc41bec7c3444ddcc4 AUX openexr-3.2.1-bintests-iff-utils.patch 399 BLAKE2B b2ba76b0fe8430cb6275bd7520ce307b8f44f642efaa90c36cea03c34b0b5d6e93cc4bc81cc30b662c3d58941696f87c76604dfd614742051e8a6be7af3115e7 SHA512 58deaacc1e81c46cccfa4190498cfbf964e1fcfef384d73f86b8b18e8348886579385f292317588f64f0f6fd1ef062465ed6253d7c7d672bdb49b1e43f8addc7 DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4 DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb @@ -11,7 +13,7 @@ DIST openexr-3.2.2.tar.gz 18825996 BLAKE2B 535d7798263ee63cbb79981bfd5b8edf4805a DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a EBUILD openexr-3.1.11.ebuild 1880 BLAKE2B dd7d09c4fd911b7f7a2738636e507f3cec991b6dc1f8484b6be081f25eb4dbac92c2ef5a8de957172d43e732a9e1ad0fa6ab3e751d822178c20d3073c927f152 SHA512 fa177bdc3a9550420927dd9e6002df468520e76cbd0ce07c9038b7336e40067c1b699def09f05ccc12a7c0e24484c809ec6e3ac7dcff6b53cefb65346de73334 EBUILD openexr-3.1.12.ebuild 1882 BLAKE2B 2f3cdb3ab5d11f88bb9d761e1b7c76bfb2466549679ee42fd7d0581f303dc01a7d014b39626677aaa2882feb01340845db9b3e1e7971baee62b028d4c5133c03 SHA512 aa1ff62a47fc6a6119d9f3d39fa122b7c3753a0f07384eba6c969ebd67e423b50716add203390a27c00af237c0407aa22b73bc36ab734a48265b26a5c7fae0d4 -EBUILD openexr-3.1.5-r1.ebuild 2031 BLAKE2B 1cf7246aff474dbb3163e83665560cc311fd4e690fc1d1c8735a321af45cb113c4c753ee0b9b757f2d7a6ce473e5e1b37d5e501c401c5cec2dddc249b5701195 SHA512 623e93ca5b56f4cfc0a6f5b50db1ca4488071748a6531c80ae542bd0fb2fa5e176b01e87a99c592d46e1997e39e976183fdb5d39eefc64556b8cfff9ec56de89 -EBUILD openexr-3.1.7.ebuild 1879 BLAKE2B d8130bb53dd321cfa0d805e513a314a6b47f443eb17d7814fb6050e2691142c419c9a58024503a46dbd3b07f0464a9b063ae8f7d6c8e16e0c4c980d1ea75eb1b SHA512 06fd0d6b8ae0f90bc538bfd5ebbc7133fdafa349810d04fec1da4d14aa17fb67d6c9be9398fd12fbee8bf31c23b4d3b48223860594f63b5b4320f8c4ca16531f +EBUILD openexr-3.1.5-r1.ebuild 2067 BLAKE2B 5def6ac36362ea8d8810bd2056df16ca57e658e83eb2a0ae6846cc322ae0be41f8c76dad1498947ed8b44fad9fac46a598e1cf173395c1a9946719f2359743b2 SHA512 9b7f62c74c723fe18766db36e4f75623818c8d2697d23f24c742061280a373fef973cc5478bd8a27492aa82249f189bdcc4c395854199d910e54d91033755174 +EBUILD openexr-3.1.7.ebuild 1924 BLAKE2B 1ae6aeb5a4693d21d798b6260fb2b485044dcfa33820f328f81993f7d3fa6a7ba98c12f183dda3b58fc8d99c3785c5e5d15acdab03d6fe2c9b19bbe76905e5cc SHA512 df60600d657768a811a5b62cb3f77c0fca177ea595b2895c7e62d797fc147f8ef0551512b67ef80d0b0ece156de143bf36e7dd20dbc88f276f879d95fb8e58e8 EBUILD openexr-3.2.2.ebuild 3269 BLAKE2B 99fc517503ed85900a3bec3eabe51c9077b2405314bb5471524411f2781b0a7991bf1f5a4fb9cebe5960993c69f56e203dc23b02167ae438827f6678ab34d90a SHA512 da2f3f5e0b9a7bedad5ed9dc82426cfecc9488a0b2b4cf9d37eb2e293041f8ffae0c3e4fd54e87f6c5622472c4b166e957df9ebe0f4f226f0a5712418161f57f MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee diff --git a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch new file mode 100644 index 000000000000..2b7a31ac694d --- /dev/null +++ b/media-libs/openexr/files/openexr-3.1.5-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__) ++# if defined(__linux__) && 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__) ++# if defined(__linux__) && defined(__i386__) + setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); + #else + setMxcsr (kfp->mxcsr, clearExceptions); 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.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild index a5039301aed5..8ec80d3071e3 100644 --- a/media-libs/openexr/openexr-3.1.5-r1.ebuild +++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch "${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch "${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch + "${FILESDIR}"/${P}-musl-i386.patch ) DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) 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() { -- cgit v1.2.3