gentoo auto-resync : 17:11:2024 - 03:03:09

7 files changed, 185 insertions, 4 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4cf00ff6a137..8dbc0ccd903d 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 99037250bd35..127cc7df1604 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,6 @@
 AUX qtmultimedia-6.7.2-ffmpeg-6.1.2.patch 2059 BLAKE2B 67af9cb2b860b46dd643b5677a9c50bde9d2f58db9262283b4de8a3708e1a1e7a23063dbdbf14ff6952a4150a9d716d22089535adbd611a2340c7fe1f780a6ec SHA512 33815330435ff9f21659161c1be3085bbb5b3ddd0449748bb962cd1f64ca4a4349b2a26e0615affb56250172e5fefe21fac4e569bab6a832cc563127ef2bb328
 AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481
+AUX qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch 5814 BLAKE2B aaf9c453258b1afe6a443f4f1d67a2e2653e6c9c725bcd592e9917ae96d812b8ce6e0608368bfddfd6d59158cac279f397a9fad5eb965a80f814279c76d3dd54 SHA512 65815de9a59a48997de4716affd8fc6ffd0cf2ec05259fce944eff12ffc0ef35cff873ff941920d257add02b90157fc782ee2091a8edea364ded624d153d81dc
 DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a979c1f317cb213c6121b4e1285294c132a1266eaeb559e7239c7cd58da072e50dc85dd9aa0c1b6aa493f95fe31268171780cd3346883 SHA512 5427c7a5e06f8296b091b2bb3fc67e678ac01bd1179de5a11c38cfe9f87ba8e3ac87a1395c2c3044ad31fc5c040230e35a1e71e173e12109c24cd97da70d9e9d
 DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c95b4f14e566c667e16c4eb264e466174a9548c6a4bd39dbab9cf14ddad444cc3318ecdf18ca9e3999a3f95a669fd121937287d466a6b9a9c14af74ff686 SHA512 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c
 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
@@ -7,8 +8,8 @@ DIST qtmultimedia-everywhere-src-6.7.3.tar.xz 9360356 BLAKE2B c3ba0c1729b4120229
 DIST qtmultimedia-everywhere-src-6.8.0.tar.xz 9591692 BLAKE2B fd55d8a97573c6eef6af605e0564746cb2aa1fa8ac604c62283e6508f2bcb0ac5f0cacdee919b71dfb8a8c94b34d876e0811c5a2b428d4c8c3ee78dc127ad6c0 SHA512 1374db720141d09ca3081b5a7dd6d0f1b4457ab87096b4bfac0b9ab97de1dadf36ded5cf04ae01824fd9e16cfe7f45f45f2ebebc464696a348284462a731388e
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
 EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84
-EBUILD qtmultimedia-6.7.3.ebuild 3605 BLAKE2B 46933e93347fdce8506a9a646ca75fab64904cb339944479524682590c420d90c53bca5e98c40a5f44d3ed3549fa8592772577459bd35a435fc004cc87a2defb SHA512 52f89bb2de3109f65f3eebb259667e83d005fa5e9854d79f4b38426efee675a0ba0ac86db9953b2ce529848379ec675c00367115098288d53409346fbdd61890
-EBUILD qtmultimedia-6.8.0.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
-EBUILD qtmultimedia-6.8.9999.ebuild 3857 BLAKE2B 36d6cb2d00fac614d63b1dd560baa9c4b808fb08ecdcfbbd475d2702fe0002bd4cd51d487d3dcc741fd3346951454469bd975308b498b38e02b41eafd3db2394 SHA512 b08f1b8052f43c9a84e45db1e40705ea71f65ead4af6d4bab613f5e64c57cc302bab0eaf842b19becb228507048c38bd14f11f404e055a1b08a7bed8a09e8e54
-EBUILD qtmultimedia-6.9999.ebuild 3857 BLAKE2B 36d6cb2d00fac614d63b1dd560baa9c4b808fb08ecdcfbbd475d2702fe0002bd4cd51d487d3dcc741fd3346951454469bd975308b498b38e02b41eafd3db2394 SHA512 b08f1b8052f43c9a84e45db1e40705ea71f65ead4af6d4bab613f5e64c57cc302bab0eaf842b19becb228507048c38bd14f11f404e055a1b08a7bed8a09e8e54
+EBUILD qtmultimedia-6.7.3.ebuild 3791 BLAKE2B 27e2f4221e030c0daa3e2cb82963b4bf5f46a316ac2a47f7cfea3b2c443a2b694c4cdc3c2a786e76baa8fb509ebd05934ae55d30fb4ae809669523f666fd8d79 SHA512 4c4d68c7785bb8cf77a87b75ab8b210013e36ec2f06032b4ea6c4fbb7dc2f22b264010d76581490f6c71ee21aad6b92fb67fed02d3e98f72752588215b9492cd
+EBUILD qtmultimedia-6.8.0.ebuild 4098 BLAKE2B 96e050d43d91de0a1b04ae7528a1a74e6350ca8fcbe882350895880d847008800269721f381f42fab7739b8a273f094f638f3e76176f914adc2adf9fbbb59b47 SHA512 2c34750c129c5e0db6e98f73c7b302db023f3adffc385b63362be68ee38af36ec6d8a5c22d6a47969cc078b216d6ae7f02644485eb9b10ff1173b8e1821d7a38
+EBUILD qtmultimedia-6.8.9999.ebuild 4043 BLAKE2B d52704ca1336b1cfa8f893f195f2cca00a874a5d4fb37eca960daf5d80af4fce93027dc6d416a53755e0e7ae48ecfafb784e507a52f69c2e7da5febb8de34080 SHA512 9aee59af92d453bbe50f0244a2d6df92047175821c5aed323675c33f9b8a93676dedf9c0b8176f43035dfcb2214224db02dac74a0a8a155f559404869821fded
+EBUILD qtmultimedia-6.9999.ebuild 4043 BLAKE2B d52704ca1336b1cfa8f893f195f2cca00a874a5d4fb37eca960daf5d80af4fce93027dc6d416a53755e0e7ae48ecfafb784e507a52f69c2e7da5febb8de34080 SHA512 9aee59af92d453bbe50f0244a2d6df92047175821c5aed323675c33f9b8a93676dedf9c0b8176f43035dfcb2214224db02dac74a0a8a155f559404869821fded
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch
new file mode 100644
index 000000000000..d7b2351134e2
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch
@@ -0,0 +1,152 @@
+Imported from dev-cpp/eigen to use with bundled's (ideally would
+unbundle but rather not w/ Qt unless there is an upstream-supported
+cmake switch, is likely broken w/ the upcoming eigen version too).
+
+This is a backport from eigen upstream, so should no longer be needed
+whenever there is a bump (not in a release as of the writing of this)
+and it is updated here.
+
+https://bugs.gentoo.org/943402
+https://bugs.gentoo.org/936107
+https://gitlab.com/libeigen/eigen/-/merge_requests/1028
+--- a/src/3rdparty/eigen/Eigen/Core
++++ b/src/3rdparty/eigen/Eigen/Core
+@@ -348,3 +348,3 @@
+ 
+-#if defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
++#if defined(EIGEN_VECTORIZE_VSX)
+   #include "src/Core/arch/AltiVec/MatrixProduct.h"
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/Complex.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/Complex.h
+@@ -102,2 +102,3 @@
+     HasMax    = 0,
++    HasSqrt   = 1,
+ #ifdef __VSX__
+@@ -322,2 +323,3 @@
+     HasMax    = 0,
++    HasSqrt   = 1,
+     HasSetLinear = 0
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/MathFunctions.h
+@@ -42,2 +42,3 @@
+ 
++#ifdef __VSX__
+ #ifndef EIGEN_COMP_CLANG
+@@ -48,6 +49,3 @@
+ }
+-#endif
+ 
+-#ifdef __VSX__
+-#ifndef EIGEN_COMP_CLANG
+ template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
+@@ -76,2 +74,22 @@
+ }
++
++template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
++  BF16_TO_F32_UNARY_OP_WRAPPER(psqrt<Packet4f>, a);
++}
++
++#ifndef EIGEN_COMP_CLANG
++template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
++  BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
++}
++#endif
++#else
++template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS
++Packet4f psqrt<Packet4f>(const Packet4f& x)
++{
++  Packet4f a;
++  for (Index i = 0; i < packet_traits<float>::size; i++) {
++    a[i] = numext::sqrt(x[i]);
++  }
++  return a;
++}
+ #endif
+--- a/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
++++ b/src/3rdparty/eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
+@@ -177,2 +177,5 @@
+ #endif
++    HasTanh = EIGEN_FAST_MATH,
++    HasErf = EIGEN_FAST_MATH,
++    HasRint = 1,
+ #else
+@@ -180,4 +183,5 @@
+     HasRsqrt = 0,
+-    HasTanh = EIGEN_FAST_MATH,
+-    HasErf = EIGEN_FAST_MATH,
++    HasTanh = 0,
++    HasErf = 0,
++    HasRint = 0,
+ #endif
+@@ -186,3 +190,2 @@
+     HasCeil = 1,
+-    HasRint = 1,
+     HasNegate = 1,
+@@ -219,2 +222,3 @@
+ #endif
++    HasRint = 1,
+ #else
+@@ -222,5 +226,6 @@
+     HasRsqrt = 0,
+-    HasTanh = EIGEN_FAST_MATH,
+-    HasErf = EIGEN_FAST_MATH,
++    HasRint = 0,
+ #endif
++    HasTanh = 0,
++    HasErf = 0,
+     HasRound = 1,
+@@ -228,3 +233,2 @@
+     HasCeil = 1,
+-    HasRint = 1,
+     HasNegate = 1,
+@@ -874,15 +878,25 @@
+ 
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_le(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_lt(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet4i pcmp_eq(const Packet4i& a, const Packet4i& b) { return reinterpret_cast<Packet4i>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_le(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_lt(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8s pcmp_eq(const Packet8s& a, const Packet8s& b) { return reinterpret_cast<Packet8s>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_le(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_lt(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet8us pcmp_eq(const Packet8us& a, const Packet8us& b) { return reinterpret_cast<Packet8us>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_le(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_lt(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmplt(a,b)); }
+ template<> EIGEN_STRONG_INLINE Packet16c pcmp_eq(const Packet16c& a, const Packet16c& b) { return reinterpret_cast<Packet16c>(vec_cmpeq(a,b)); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_le(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmple(a,b)); }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet16uc pcmp_lt(const Packet16uc& a, const Packet16uc& b) { return reinterpret_cast<Packet16uc>(vec_cmplt(a,b)); }
+@@ -939,2 +953,3 @@
+ template<> EIGEN_STRONG_INLINE Packet4f pfloor<Packet4f>(const Packet4f& a) { return vec_floor(a); }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet4f print<Packet4f>(const Packet4f& a)
+@@ -949,2 +964,3 @@
+ }
++#endif
+ 
+@@ -1343,8 +1359,2 @@
+ 
+-template<> EIGEN_STRONG_INLINE Packet8bf psqrt<Packet8bf> (const Packet8bf& a){
+-  BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a);
+-}
+-template<> EIGEN_STRONG_INLINE Packet8bf prsqrt<Packet8bf> (const Packet8bf& a){
+-  BF16_TO_F32_UNARY_OP_WRAPPER(prsqrt<Packet4f>, a);
+-}
+ template<> EIGEN_STRONG_INLINE Packet8bf pexp<Packet8bf> (const Packet8bf& a){
+@@ -1392,2 +1402,3 @@
+ }
++#ifdef __VSX__
+ template<> EIGEN_STRONG_INLINE Packet8bf print<Packet8bf> (const Packet8bf& a){
+@@ -1395,2 +1406,3 @@
+ }
++#endif
+ template<> EIGEN_STRONG_INLINE Packet8bf pmadd(const Packet8bf& a, const Packet8bf& b, const Packet8bf& c) {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
index 5551e4ef4321..4c90076675b9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
@@ -83,7 +83,14 @@ CMAKE_SKIP_TESTS=(
 	tst_qwindowcapturebackend
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
 src_configure() {
+	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
 	# normally passed by the build system, but needed for 32-on-64 chroots
 	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
index 90448d9168fe..36775e529d95 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
 	tst_qwindowcapturebackend
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
 src_configure() {
+	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
 	# normally passed by the build system, but needed for 32-on-64 chroots
 	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 2b44b871eb93..dccb2e3e1506 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
 	tst_qwindowcapturebackend
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
 src_configure() {
+	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
 	# normally passed by the build system, but needed for 32-on-64 chroots
 	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 2b44b871eb93..dccb2e3e1506 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -90,7 +90,14 @@ CMAKE_SKIP_TESTS=(
 	tst_qwindowcapturebackend
 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
+)
+
 src_configure() {
+	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
+	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
+
 	# normally passed by the build system, but needed for 32-on-64 chroots
 	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE