Accepting request 1036910 from KDE:Qt6
Qt 6.4.1 (forwarded request 1036897 from cgiboudeaux) OBS-URL: https://build.opensuse.org/request/show/1036910 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-multimedia?expand=0&rev=10
This commit is contained in:
commit
77cc37f5e3
@ -1,43 +0,0 @@
|
||||
From 01f59c31a729b7253a914939d591663983235b25 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Thu, 21 Jul 2022 09:02:00 +0200
|
||||
Subject: [PATCH] 3rdparty: Fix build on unsupported platforms
|
||||
|
||||
PPC, PPC64 and x86 require additional build flags to use pffft and eigen.
|
||||
---
|
||||
src/resonance-audio/CMakeLists.txt | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/src/resonance-audio/CMakeLists.txt b/src/resonance-audio/CMakeLists.txt
|
||||
index 1d26cfd..1c36c87 100644
|
||||
--- a/src/resonance-audio/CMakeLists.txt
|
||||
+++ b/src/resonance-audio/CMakeLists.txt
|
||||
@@ -206,6 +206,25 @@ qt_internal_add_3rdparty_library(BundledResonanceAudio
|
||||
${SADIE_HRTFS_DIR}
|
||||
../3rdparty/eigen
|
||||
)
|
||||
+
|
||||
+# Required by pffft on certain PowerPC archs
|
||||
+qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
|
||||
+ COMPILE_OPTIONS
|
||||
+ -maltivec
|
||||
+)
|
||||
+
|
||||
+# Required by eigen on certain PowerPC archs
|
||||
+qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
|
||||
+ COMPILE_OPTIONS
|
||||
+ -mvsx
|
||||
+)
|
||||
+
|
||||
+# Use fallback mode where SSE is not available
|
||||
+qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86$")
|
||||
+ COMPILE_OPTIONS
|
||||
+ -DPFFFT_SIMD_DISABLE
|
||||
+)
|
||||
+
|
||||
qt_disable_warnings(BundledResonanceAudio)
|
||||
qt_set_symbol_visibility_hidden(BundledResonanceAudio)
|
||||
|
||||
--
|
||||
2.37.0
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 15 11:53:15 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.4.1:
|
||||
* https://www.qt.io/blog/qt-6.4.1-released
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-3rdparty-Fix-build-on-unsupported-platforms.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 29 10:35:55 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.4.0
|
||||
%define real_version 6.4.1
|
||||
%define short_version 6.4
|
||||
%define short_name qtmultimedia
|
||||
%define tar_name qtmultimedia-everywhere-src
|
||||
@ -28,15 +28,13 @@
|
||||
%endif
|
||||
#
|
||||
Name: qt6-multimedia%{?pkg_suffix}
|
||||
Version: 6.4.0
|
||||
Version: 6.4.1
|
||||
Release: 0
|
||||
Summary: Qt 6 Multimedia libraries
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
|
||||
Source1: qt6-multimedia-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: 0001-3rdparty-Fix-build-on-unsupported-platforms.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: qt6-core-private-devel
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e82e8e847cae2a951a11db05b6d10a22b21e3a1d72e06a7781cce4bd197e796f
|
||||
size 5936088
|
3
qtmultimedia-everywhere-src-6.4.1.tar.xz
Normal file
3
qtmultimedia-everywhere-src-6.4.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf
|
||||
size 5934284
|
Loading…
Reference in New Issue
Block a user