10:06 a.m.
commit 2d75f6d1b459e9e841c01686db9340a1d7acde1e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Nov 18 10:04:50 2023 +0000
3.4.2
.gitignore | 2 ++
audacity-3.4.0-fix-build.patch | 23 +++++++++++++++++++----
audacity-freeworld.spec | 12 ++++++++----
clang_fix.patch | 11 +++++++++++
sources | 2 +-
5 files changed, 41 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0903372..7c9aa0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
/Audacity-3.3.2.tar.gz
/Audacity-3.3.3.tar.gz
/Audacity-3.4.0.tar.gz
+/Audacity-3.4.1.tar.gz
+/Audacity-3.4.2.tar.gz
diff --git a/audacity-3.4.0-fix-build.patch b/audacity-3.4.0-fix-build.patch
index bdda5cb..ab00a3b 100644
--- a/audacity-3.4.0-fix-build.patch
+++ b/audacity-3.4.0-fix-build.patch
@@ -1,11 +1,26 @@
+From bd2ef6d1bf7302964742ed307861ab51bc19f65c Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <dmitry(a)crsib.me>
+Date: Mon, 6 Nov 2023 13:14:20 +0300
+Subject: [PATCH] Fixes the GCC build when targeting ARM CPUs with NEON support
+
+---
+ libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
b/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
+index 7bc3c3d49533..7bf36aceda57 100644
--- a/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
+++ b/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
-@@ -45,7 +45,7 @@ struct float_x4
+@@ -44,8 +44,11 @@ struct float_x4
+ s.n128_f32[1] = v1;
s.n128_f32[2] = v2;
s.n128_f32[3] = v3;
- #else
-- s = {v0, v1, v2, v3};
-+ s = float32x4_t{v0, v1, v2, v3};
+-#else
++#elif __clang__
+ s = {v0, v1, v2, v3};
++#else
++ float f[4] = {v0, v1, v2, v3};
++ s = vld1q_f32(f);
#endif
}
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 0fdbfa7..2828320 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -1,10 +1,10 @@
%global __requires_exclude ^lib-.*.so
%global __provides_exclude ^lib-.*.so
-#global toolchain clang
+%global toolchain clang
Name: audacity-freeworld
-Version: 3.4.0
+Version: 3.4.2
Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
@@ -23,11 +23,11 @@ Patch0: audacity-2.4.2-fix-portmidi-as-system.patch
Patch1: audacity-2.4.2-fix-libmp3lame-as-system.patch
Patch2: audacity-non-x86.patch
Patch3: audacity-3.2.1-compile.patch
-Patch4: audacity-3.4.0-fix-build.patch
+Patch4: clang_fix.patch
BuildRequires: cmake
BuildRequires: gettext-devel
-BuildRequires: gcc-c++
+BuildRequires: clang
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
@@ -56,6 +56,7 @@ BuildRequires: portaudio-devel >= 19-16
BuildRequires: portmidi-devel
BuildRequires: rapidjson-devel
BuildRequires: serd-devel
+BuildRequires: shared-mime-info
BuildRequires: sord-devel
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
@@ -160,6 +161,9 @@ rm -f %{buildroot}%{_prefix}/%{realname}
%license LICENSE.txt
%changelog
+* Fri Nov 17 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.2-1
+- 3.4.2
+
* Fri Nov 03 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.0-1
- 3.4.0
diff --git a/clang_fix.patch b/clang_fix.patch
new file mode 100644
index 0000000..0105fe9
--- /dev/null
+++ b/clang_fix.patch
@@ -0,0 +1,11 @@
+--- a/src/ListNavigationPanel.h
++++ b/src/ListNavigationPanel.h
+@@ -13,8 +13,6 @@
+ #include <wx/window.h>
+ #include <wx/containr.h>
+
+-extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
+-
+ #include "ListNavigationEnabled.h"
+
+ //!Focusable widget container.
diff --git a/sources b/sources
index 787994f..7166df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Audacity-3.4.0.tar.gz) =
1fff66d3199591fed24a7b7a7ea3cb8b2a381c4f16d15a67949f2631a2e5ff2cac28a599b3ce28b0812de70f4984dfa51d37b3bed4e8f75deb4d5006817998d4
+SHA512 (Audacity-3.4.2.tar.gz) =
a4a3bc68e46988e5538edbe6d8f42428b69e3f294b8d65337600e6806b516100d20a92135954f073c863d29767b904b781bd3a09cec40b8a85ee4463f52e1759