commit 4aa21c418e7bf56e56c66f85437b9925efc4b742 Author: Uwe Klotz <uwe.klotz(a)gmail.com&gt; Date: Sat Apr 22 15:53:39 2023 +0200 Switch back to GCC 13 aarch64_asm_operand_widths.patch | 16 +++------------- fidlib-fno-finite-math.patch | 20 ++++++++++++++++++++ mixxx.spec | 22 ++++++++-------------- 3 files changed, 31 insertions(+), 27 deletions(-) --- diff --git a/aarch64_asm_operand_widths.patch b/aarch64_asm_operand_widths.patch index fdd523d..bd00507 100644 --- a/aarch64_asm_operand_widths.patch +++ b/aarch64_asm_operand_widths.patch @@ -1,13 +1,3 @@ -From 38a145c6ba4022c70f36290c7f52d5cb91826a95 Mon Sep 17 00:00:00 2001 -From: Uwe Klotz <uwe.klotz(a)gmail.com&gt; -Date: Mon, 17 Apr 2023 22:41:32 +0200 -Subject: [PATCH] aarch64: Fix -Wasm-operand-widths - ---- - src/soundio/sounddevicenetwork.cpp | 2 +- - src/soundio/sounddeviceportaudio.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp index aff65b9dc0..8da832d6a9 100644 --- a/src/soundio/sounddevicenetwork.cpp @@ -20,7 +10,7 @@ index aff65b9dc0..8da832d6a9 100644 + int64_t savedFPCR; asm volatile("mrs %[savedFPCR], FPCR" : [ savedFPCR ] "=r"(savedFPCR)); - + diff --git a/src/soundio/sounddeviceportaudio.cpp b/src/soundio/sounddeviceportaudio.cpp index 681d0942cc..97a4429420 100644 --- a/src/soundio/sounddeviceportaudio.cpp @@ -33,7 +23,7 @@ index 681d0942cc..97a4429420 100644 + int64_t savedFPCR; asm volatile("mrs %[savedFPCR], FPCR" : [ savedFPCR ] "=r"(savedFPCR)); - --- + +-- 2.40.0 diff --git a/fidlib-fno-finite-math.patch b/fidlib-fno-finite-math.patch new file mode 100644 index 0000000..1e311ef --- /dev/null +++ b/fidlib-fno-finite-math.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a3c93f044..18f30caf62 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1852,10 +1852,13 @@ add_library(fidlib STATIC EXCLUDE_FROM_ALL lib/fidlib/fidlib.c) + if(MSVC) + target_compile_definitions(fidlib PRIVATE T_MSVC) + target_compile_definitions(fidlib PRIVATE _USE_MATH_DEFINES) ++ target_compile_options(fidlib PRIVATE /W3) + elseif(MINGW) + target_compile_definitions(fidlib PRIVATE T_MINGW) ++ target_compile_options(fidlib PRIVATE -fno-finite-math-only) + else() + target_compile_definitions(fidlib PRIVATE T_LINUX) ++ target_compile_options(fidlib PRIVATE -fno-finite-math-only) + endif() + target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib) + target_link_libraries(mixxx-lib PRIVATE fidlib) +-- +2.40.0 diff --git a/mixxx.spec b/mixxx.spec index 2702f99..42982e8 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -25,7 +25,7 @@ Name: mixxx Version: 2.3.4 -Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} +Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist} Summary: Mixxx is open source software for DJ'ing License: GPLv2+ URL: http://www.mixxx.org @@ -35,10 +35,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{ Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder... Patch0: disable_werror_in_tests.patch Patch1: aarch64_asm_operand_widths.patch - -# TODO: Switch back from "clang" to "gcc" after issues have been fixed? -# See also: <https://github.com/mixxxdj/mixxx/issues/11483> -%global toolchain clang +Patch2: fidlib-fno-finite-math.patch # Build Tools BuildRequires: desktop-file-utils @@ -46,7 +43,7 @@ BuildRequires: appstream BuildRequires: protobuf-compiler BuildRequires: cmake BuildRequires: ccache -BuildRequires: clang +BuildRequires: gcc-c++ BuildRequires: ninja-build # Build Requirements @@ -125,9 +122,6 @@ cp %{SOURCE1} %{__cmake_builddir}/downloads %cmake \ -GNinja \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_LINKER=clang++ \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTIMIZE=portable \ -DINSTALL_USER_UDEV_RULES=ON \ @@ -170,22 +164,19 @@ rm -rf \ %check -# TODO: Re-enable Denormal test after Mixxx v2.3.5 has been released. -# <https://github.com/mixxxdj/mixxx/issues/11484> - # TODO: Enable EngineBufferE2ETest after spurious failures for # x86_64 when run on AMD EPYC have been resolved. Varying tests # are failing sometimes. %ifarch x86_64 %global ctest_timeout_secs 180 - %global ctest_exclude_regex EngineBufferE2ETest|Denormal + %global ctest_exclude_regex EngineBufferE2ETest %endif # TODO: Enable ControllerEngine NaN tests on ARM after the cause for # the failing tests has been found and fixed. %ifarch %{arm32} %{arm64} %global ctest_timeout_secs 300 - %global ctest_exclude_regex setValue_IgnoresNaN|setParameter_NaN|Denormal + %global ctest_exclude_regex setValue_IgnoresNaN|setParameter_NaN %endif %ifarch %{power64} @@ -222,6 +213,9 @@ appstreamcli \ %{_udevrulesdir}/69-%{name}-usb-uaccess.rules %changelog +* Sat Apr 22 2023 Uwe Klotz <uklotz(a)gmail.com&gt; - 2.3.4-4 +- Switch back to GCC 13 + * Mon Apr 17 2023 Uwe Klotz <uklotz(a)gmail.com&gt; - 2.3.4-3 - Switch from GCC 13 to Clang 16