audacity 3.4.2-2 (znver1;aarch64;x86_64) 2024-17697
0

Status rejected
Submitter rugyada [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/417767
Packages
audacity-3.4.2-2.znver1.binary
audacity-3.4.2-2.znver1.source
audacity-debuginfo-3.4.2-2.znver1.debuginfo
audacity-debugsource-3.4.2-2.znver1.binary
audacity-3.4.2-2.aarch64.binary
audacity-3.4.2-2.aarch64.source
audacity-debuginfo-3.4.2-2.aarch64.debuginfo
audacity-debugsource-3.4.2-2.aarch64.binary
audacity-3.4.2-2.x86_64.source
audacity-3.4.2-2.x86_64.binary
audacity-debuginfo-3.4.2-2.x86_64.debuginfo
audacity-debugsource-3.4.2-2.x86_64.binary
Build Date 2024-04-21 14:47:24 +0000 UTC
Last Updated 2024-04-27 14:38:00.945157269 +0000 UTC
$ git diff --patch-with-stat --summary 2ad0cb49fd6f422f5b0f1fc46c8548aa55094f57..9ad488cbb103cc7cae7f3c42d2583327d4756b2e

 .abf.yml                       |  2 +-
 audacity-3.2.1-compile.patch   | 17 +++++++++++++----
 audacity-3.4.0-fix-build.patch | 12 ++++++++++++
 audacity.spec                  | 15 +++++++++++----
 rpath-openmandriva.patch       | 10 +++++-----
 5 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 audacity-3.4.0-fix-build.patch

diff --git a/.abf.yml b/.abf.yml
index 9a037b9..a57ea5b 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  audacity-sources-3.2.3.tar.gz: 985fb4ceefc1eaa7cc9a95f71a2e1d3ff892ca01
+  audacity-sources-3.4.2.tar.gz: 16b2fc0b0db143552ea4c01cd49aa87fd93f7f23
diff --git a/audacity-3.2.1-compile.patch b/audacity-3.2.1-compile.patch
index a8ab62a..75b133a 100644
--- a/audacity-3.2.1-compile.patch
+++ b/audacity-3.2.1-compile.patch
@@ -1,7 +1,16 @@
-diff -up audacity-sources-3.2.1/src/effects/RealtimeEffectState.cpp.omv~ audacity-sources-3.2.1/src/effects/RealtimeEffectState.cpp
---- audacity-sources-3.2.1/src/effects/RealtimeEffectState.cpp.omv~	2022-10-26 22:48:22.434333601 +0200
-+++ audacity-sources-3.2.1/src/effects/RealtimeEffectState.cpp	2022-10-26 22:50:32.197225244 +0200
-@@ -223,7 +223,7 @@ struct RealtimeEffectState::Access final
+diff -uraN audacity-sources-3.3.1/libraries/lib-realtime-effects/RealtimeEffectState.cpp omv-audacity-sources-3.3.1/libraries/lib-realtime-effects/RealtimeEffectState.cpp
+--- audacity-sources-3.3.1/libraries/lib-realtime-effects/RealtimeEffectState.cpp	2023-04-27 19:18:56.000000000 +0200
++++ omv-audacity-sources-3.3.1/libraries/lib-realtime-effects/RealtimeEffectState.cpp	2023-04-30 15:42:54.701877191 +0200
+@@ -278,7 +278,7 @@
+       if (auto pState = mwState.lock()) {
+          if (auto pAccessState = pState->GetAccessState()) {
+             assert(pAccessState->mMainThreadId == std::this_thread::get_id());
+-            
++
+             if (pAccessState->mState.mInitialized)
+             {
+                std::unique_lock lk(pAccessState->mLockForCV);
+@@ -303,7 +303,7 @@
        if (auto pOther = dynamic_cast<const Access*>(&other)) {
           auto &mine = mwState;
           auto &theirs = pOther->mwState;
diff --git a/audacity-3.4.0-fix-build.patch b/audacity-3.4.0-fix-build.patch
new file mode 100644
index 0000000..4d3e1e2
--- /dev/null
+++ b/audacity-3.4.0-fix-build.patch
@@ -0,0 +1,12 @@
+diff -up audacity-sources-3.4.1/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h.1~ audacity-sources-3.4.1/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
+--- audacity-sources-3.4.1/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h.1~	2023-11-08 23:13:52.496674319 +0100
++++ audacity-sources-3.4.1/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h	2023-11-08 23:14:57.753140302 +0100
+@@ -45,7 +45,7 @@ struct float_x4
+     s.n128_f32[2] = v2;
+     s.n128_f32[3] = v3;
+ #elif __clang__
+-    s = {v0, v1, v2, v3};
++    s = float32x4_t{v0, v1, v2, v3};
+ #else
+     float f[4] = {v0, v1, v2, v3};
+     s = vld1q_f32(f);
diff --git a/audacity.spec b/audacity.spec
index 14d6e23..217b6cd 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -6,7 +6,7 @@
 
 Summary:	Free Audio Editor With Effects/Analysis Tools
 Name:		audacity
-Version:	3.2.3
+Version:	3.4.2
 Release:	2
 License:	GPLv2+
 Group:		Sound
@@ -15,9 +15,10 @@ Source0:	https://github.com/audacity/audacity/releases/download/Audacity-%{versi
 #Source0:	https://www.fosshub.com/Audacity.html/audacity-%{version}-source.tar.gz
 Source100:	%{name}.rpmlintrc
 #Patch0:         audacity-2.4.2-default-theme-dark.patch
-Patch1:         system-wx.patch
+#Patch1:         system-wx.patch
 #Patch2:         0001-Fix-compilation-with-llvm-11.0.1.patch
 #Patch3:		audacity-workaround-clang-bug-50230.patch
+Patch3:		audacity-3.4.0-fix-build.patch
 Patch4:		audacity-3.0.2-no-x86-hardcodes.patch
 Patch5:		rpath-openmandriva.patch
 Patch6:		audacity-3.2.1-compile.patch
@@ -46,6 +47,7 @@ BuildRequires:	pkgconfig(jack)
 BuildRequires:  pkgconfig(lv2)
 BuildRequires:	pkgconfig(mad)
 BuildRequires:	pkgconfig(opus)
+BuildRequires:	pkgconfig(opusfile)
 BuildRequires:	pkgconfig(ogg)
 BuildRequires:	pkgconfig(samplerate)
 BuildRequires:	pkgconfig(sndfile)
@@ -70,6 +72,8 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtk+-x11-3.0)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:	pkgconfig(RapidJSON)
+#BuildRequires:	vst3sdk
 
 %description
 Audacity is a program that lets you manipulate digital audio waveforms.
@@ -86,6 +90,9 @@ mode and a frequency analysis window for audio analysis applications.
 chmod 644 *.txt
 
 %build
+# As of Clang 16 & 17 and Audacity 3.3.1 % 3.4.0, app compiled with Clang no longer launching. No errors that would give some guess. Switch to GCC for now.
+export CC=gcc
+export CXX=g++
 [ ! -f src/RevisionIdent.h ] && echo ' ' > src/RevisionIdent.h
 # sbsms uses x86 inline assembly
 %cmake \
@@ -128,10 +135,10 @@ desktop-file-install \
         %{buildroot}%{_datadir}/applications/*
 
 %files -f %{name}.lang
-%doc LICENSE.txt README.txt
+%doc LICENSE.txt README*
 %{_bindir}/*
 %{_libdir}/%{name}/lib*
-%{_libdir}/%{name}/modules/mod-script-pipe.so
+%{_libdir}/audacity/modules/mod*
 %{_datadir}/audacity
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/audacity.*
diff --git a/rpath-openmandriva.patch b/rpath-openmandriva.patch
index 287014c..3c45c8a 100644
--- a/rpath-openmandriva.patch
+++ b/rpath-openmandriva.patch
@@ -1,9 +1,9 @@
-diff -uraN Audacity-3.1.3-Source/CMakeLists.txt omv-Audacity-3.1.3-Source/CMakeLists.txt
---- Audacity-3.1.3-Source/CMakeLists.txt	2021-12-22 16:35:57.000000000 +0100
-+++ omv-Audacity-3.1.3-Source/CMakeLists.txt	2022-01-07 20:51:26.735389298 +0100
-@@ -344,7 +344,7 @@
+diff -uraN audacity-sources-3.3.1/CMakeLists.txt omv-audacity-sources-3.3.1/CMakeLists.txt
+--- audacity-sources-3.3.1/CMakeLists.txt	2023-04-27 19:18:56.000000000 +0200
++++ omv-audacity-sources-3.3.1/CMakeLists.txt	2023-04-30 15:20:13.097171674 +0200
+@@ -420,7 +420,7 @@
  # Setup RPATH handling
- set( CMAKE_BUILD_RPATH "${_DEST}/${_PKGLIB}" )
+ set( CMAKE_BUILD_RPATH "$ORIGIN/../${_PKGLIB}" )
  set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
 -set( CMAKE_INSTALL_RPATH "$ORIGIN/../${_PKGLIB}" )
 +set( CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${_PKGLIB}" )
Not Available

rugyada [@T] gmail.comNo Comment.56d 20hrs