qt6_multimedia, disable SIMD for 32bit (#13885)

This commit is contained in:
Schrijvers Luc
2026-04-03 17:24:33 +02:00
committed by GitHub
parent ee5afb833c
commit 79b6b0ab7a
2 changed files with 30 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
From ef8e8f13a83b1e7b120861d2915493e02d15ff19 Mon Sep 17 00:00:00 2001
From 2fab4f85dca6c1f95c47c0744b9dbf53a4075b4a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 9 Apr 2024 22:25:53 +1000
Subject: Enable OpenAL (wasm) audio backend for Haiku
@@ -275,7 +275,7 @@ index c774f2a..a99d8d6 100644
2.52.0
From 623b9f5c468f55480aaeaf59a32e55028e210d16 Mon Sep 17 00:00:00 2001
From 0181ff929dc9eeebab1f1f27b178c4e4c75e74ab Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 12 Jul 2025 11:15:53 +0200
Subject: Patch* qwasmmediadevices.cpp (changed in 6.9.1)
@@ -355,7 +355,7 @@ index 0ebd337..adad982 100644
2.52.0
From b74241e65092723f9a5fdcf2c37e2a05906c55a9 Mon Sep 17 00:00:00 2001
From e894ffcaa040b075de042f46d264431045186435 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 12 Feb 2026 17:18:52 +0100
Subject: FFmpeg: Add audio/ogg to the MIME type list
@@ -380,7 +380,7 @@ index 9ac7852..e1f71b9 100644
2.52.0
From 698ab68768b135ffaa9348fb795b39b61ed99e1d Mon Sep 17 00:00:00 2001
From 2cf82cc5df09e44b4c89725874064dab954521d1 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Fri, 13 Mar 2026 08:05:33 +0100
Subject: QAudioFormat::Float unconditionally to the list of supported formats
@@ -407,3 +407,29 @@ index 8cba6c1..d7afcec 100644
--
2.52.0
From 66c6f8599a28bbeeb3433bd83ebda6ce3fe32550 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Tue, 31 Mar 2026 18:54:14 +0200
Subject: Disable SIMD for 32bit
diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
index 6732e68..a0077c7 100644
--- a/src/resonance-audio/CMakeLists.txt
+++ b/src/resonance-audio/CMakeLists.txt
@@ -232,9 +232,9 @@ qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCES
)
# Use fallback mode if SSE is not available
-qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86(-AT386)?$")
+qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86$|i[3-6]86(-AT386)?$")
COMPILE_OPTIONS
- -DPFFFT_SIMD_DISABLE
+ -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
)
qt_disable_warnings(BundledResonanceAudio)
--
2.52.0

View File

@@ -97,11 +97,6 @@ BUILD()
{
export DISABLE_ASLR=1
# disable simd code for x86_gcc2
if [ $targetArchitecture == x86_gcc2 ]; then
sed -i -e 's|//#define PFFFT_SIMD_DISABLE|#define PFFFT_SIMD_DISABLE|' src/3rdparty/pffft/pffft.c
fi
cmake -B build -S $sourceDir -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS=-fPIC \