summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-08-24 18:37:12 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-09-05 09:01:07 -0400
commit4c4c6fc87c44bc1b5b979ec8c6b2b752a86a4b38 (patch)
tree1bfe047d577dd9364e157dc10b88b014e658f5ce
parentdev-qt/qtdeclarative: match vulkan, move shader to bdep, adjust sql (diff)
downloadgentoo-4c4c6fc87c44bc1b5b979ec8c6b2b752a86a4b38.tar.gz
gentoo-4c4c6fc87c44bc1b5b979ec8c6b2b752a86a4b38.tar.bz2
gentoo-4c4c6fc87c44bc1b5b979ec8c6b2b752a86a4b38.zip
dev-qt/qtmultimedia: fix for x86 chroots (qt6)
Not that doing keywording at the moment, but does not hurt to be prepared (due to a cmake string comparing i*86 with what is likely x86_64 in the chroot), and then leading to intrinsic inlining failed build issues. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild5
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild5
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild5
3 files changed, 12 insertions, 3 deletions
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
index 78cc597e3774..8e38c2afc14e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
@@ -63,6 +63,9 @@ CMAKE_SKIP_TESTS=(
)
src_configure() {
+ # normally passed by the build system, but needed for 32-on-64 chroots
+ use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+
local mycmakeargs=(
$(qt_feature alsa)
$(qt_feature ffmpeg)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
index 78cc597e3774..8e38c2afc14e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
@@ -63,6 +63,9 @@ CMAKE_SKIP_TESTS=(
)
src_configure() {
+ # normally passed by the build system, but needed for 32-on-64 chroots
+ use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+
local mycmakeargs=(
$(qt_feature alsa)
$(qt_feature ffmpeg)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 78cc597e3774..8e38c2afc14e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit qt6-build
+inherit flag-o-matic qt6-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
@@ -63,6 +63,9 @@ CMAKE_SKIP_TESTS=(
)
src_configure() {
+ # normally passed by the build system, but needed for 32-on-64 chroots
+ use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+
local mycmakeargs=(
$(qt_feature alsa)
$(qt_feature ffmpeg)