rpm/audacity
SHA256
1
0
Fork 0
forked from pool/audacity
Code Pull Requests Activity

Accepting request 1094729 from home:kill_it:daw

Browse Source 
- Update to 3.3.3
- Downgrade vst3stk to 3.7.3_build_20 as most compatible with audacity
- Rework vst3sdk patches vst3sdk-3.7.3_build_20:
  remove vst3sdk-fix-include-cstdint-for-gcc13.patch,
         vst3sdk-fix-limits-include-moduleinfoparser.patch
  add vst3sdk-fix-std-atomic-for-gcc12.patch,
      vst3sdk-fix-include-cstdint.patch
- Add vst-system-path.patch changes vst(3) search path to /usr/lib64
  This is a hotfix release. It fixes the following bugs:
  
  * #4618 Fixed EQ not scaling properly when resizing the window.
  * #4743 Fixed the audio.com upload flow.

OBS-URL: https://build.opensuse.org/request/show/1094729
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=206
This commit is contained in:
Dave Plater 2023-06-23 05:51:33 +00:00 committed by Git OBS Bridge
parent e6582fd3ef
commit a671efefc2
12 changed files with 113 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Audacity-3.3.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73d00d9b5a80ef41643be4ed622d79fa16250ea38a8533af629ab86e3f80291d
size 57117528

3
Audacity-3.3.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf6863553bd2b822d3f236acb2de32527c93a968d114c6663920d2ebf61bf743
size 57120215

5
_service
View File

@ -2,8 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/steinbergmedia/vst3sdk/</param>
<param name="revision">v3.7.7_build_19</param>
<param name="version">3.7.7_build_19</param>
<param name="revision">v3.7.3_build_20</param>
<param name="version">3.7.3_build_20</param>
<param name="exclude">doc</param>
<param name="filename">vst3sdk</param>
</service>
<service name="recompress" mode="disabled">

18
audacity.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Jun 22 04:13:22 UTC 2023 - Konstantin Voinov <kv@kott.no-ip.biz>
- Update to 3.3.3
- Downgrade vst3stk to 3.7.3_build_20 as most compatible with audacity
- Rework vst3sdk patches vst3sdk-3.7.3_build_20:
remove vst3sdk-fix-include-cstdint-for-gcc13.patch,
vst3sdk-fix-limits-include-moduleinfoparser.patch
add vst3sdk-fix-std-atomic-for-gcc12.patch,
vst3sdk-fix-include-cstdint.patch
- Add vst-system-path.patch changes vst(3) search path to /usr/lib64
This is a hotfix release. It fixes the following bugs:
* #4618 Fixed EQ not scaling properly when resizing the window.
* #4743 Fixed the audio.com upload flow.
-------------------------------------------------------------------
Fri May 19 18:18:47 UTC 2023 - Konstantin Voinov <kv@kott.no-ip.biz>

20
audacity.spec
View File

@ -24,7 +24,7 @@
%endif
Name: audacity
Version: 3.3.2
Version: 3.3.3
Release: 0
Summary: A Multi Track Digital Audio Editor
License: CC-BY-3.0 AND GPL-2.0-or-later AND GPL-3.0-only
@ -33,14 +33,16 @@ URL: http://audacityteam.org/
Source: https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz
Source1: audacity-license-nyquist
Source2: audacity-rpmlintrc
Source3: vst3sdk-3.7.7_build_19.tar.xz
Source3: vst3sdk-3.7.3_build_20.tar.xz
# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp.
Patch0: audacity-no_buildstamp.patch
# PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch - Fix false positive errors Two new gcc10 ones ignoring assert
Patch1: audacity-no_return_in_nonvoid.patch
Patch2: mod-script-pipe-disable-rpath.patch
Patch95: vst3sdk-fix-include-cstdint-for-gcc13.patch
Patch96: vst3sdk-fix-limits-include-moduleinfoparser.patch
# PATCH-FIX-OPENSUSE vst-system-path.patch - search fo vsts in /usr/lib64 in x86_64 and ARM system
Patch3: vst-system-path.patch
Patch94: vst3sdk-fix-std-atomic-for-gcc12.patch
Patch95: vst3sdk-fix-include-cstdint.patch
BuildRequires: cmake >= 3.16
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@ -117,6 +119,10 @@ physical memory size can be edited.
%patch1 -p1
%patch2 -p1
%ifarch x86_64 aarch64
%patch3 -p1
%endif
cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/
@ -126,8 +132,9 @@ touch include/RevisionIdent.h
%if %{with vst}
tar xf %{SOURCE3} --strip-components=1 --one-top-level=vst3sdk
%patch94 -p1 -d vst3sdk
%patch95 -p1 -d vst3sdk
%patch96 -p1 -d vst3sdk
%endif
%build
@ -150,7 +157,8 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)"
%if %{without vst}
-Daudacity_has_vst3=off \
%endif
-Daudacity_use_ffmpeg:STRING=loaded
-Daudacity_use_ffmpeg:STRING=loaded \
-DVST3_DEFAULT_INSTALL_PATH=%{_libdir}/vst3/
# Workaround for an old cmake in Leap 15.3
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}

36
vst-system-path.patch Normal file
View File

@ -0,0 +1,36 @@
diff -ur audacity-Audacity-3.3.3.orig/libraries/lib-vst3/module_linux.cpp audacity-Audacity-3.3.3/libraries/lib-vst3/module_linux.cpp
--- audacity-Audacity-3.3.3.orig/libraries/lib-vst3/module_linux.cpp 2023-06-08 06:17:02.000000000 -0700
+++ audacity-Audacity-3.3.3/libraries/lib-vst3/module_linux.cpp 2023-06-08 15:55:40.689042067 -0700
@@ -278,7 +278,7 @@
* Application : /$APPFOLDER/vst3/
*/
- const auto systemPaths = {"/usr/lib/vst3/", "/usr/local/lib/vst3/"};
+ const auto systemPaths = {"/usr/lib64/vst3/", "/usr/local/lib/vst3/"};
PathList list;
if (auto homeDir = getenv ("HOME"))
diff -ur audacity-Audacity-3.3.3.orig/libraries/lib-vst3/VST3EffectsModule.cpp audacity-Audacity-3.3.3/libraries/lib-vst3/VST3EffectsModule.cpp
--- audacity-Audacity-3.3.3.orig/libraries/lib-vst3/VST3EffectsModule.cpp 2023-06-08 06:17:02.000000000 -0700
+++ audacity-Audacity-3.3.3/libraries/lib-vst3/VST3EffectsModule.cpp 2023-06-08 15:55:54.309041756 -0700
@@ -169,7 +169,7 @@
pathList.push_back("/Network/Library/Audio/Plug-ins/VST3/");
#elif __WXGTK__
pathList.push_back(wxGetHomeDir() + "/.vst3/");
- pathList.push_back("/usr/lib/vst3/");
+ pathList.push_back("/usr/lib64/vst3/");
pathList.push_back("/usr/local/lib/vst3/");
#endif
diff -ur audacity-Audacity-3.3.3.orig/src/effects/VST/VSTEffect.cpp audacity-Audacity-3.3.3/src/effects/VST/VSTEffect.cpp
--- audacity-Audacity-3.3.3.orig/src/effects/VST/VSTEffect.cpp 2023-06-08 06:17:02.000000000 -0700
+++ audacity-Audacity-3.3.3/src/effects/VST/VSTEffect.cpp 2023-06-08 15:58:57.777037560 -0700
@@ -346,7 +346,7 @@
pathList.push_back(wxT(LIBDIR) wxT("/vst"));
// These are the defaults used by other hosts
- pathList.push_back(wxT("/usr/lib/vst"));
+ pathList.push_back(wxT("/usr/lib64/vst"));
pathList.push_back(wxT("/usr/local/lib/vst"));
pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".vst"));
}

3
vst3sdk-3.7.3_build_20.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7cf5aa32803d0b9f09cd257400d7b706350c0deff6bd5cdad61a38a1bf40d46
size 14407116

3
vst3sdk-3.7.7_build_19.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7e811eecaa7f91ba51a1e83ccc04886074785b6a87c526b9a02b6ec146ed958
size 40638144

13
vst3sdk-fix-include-cstdint-for-gcc13.patch
View File

@ -1,13 +0,0 @@
Submodule public.sdk contains modified content
diff --git a/public.sdk/source/vst/moduleinfo/moduleinfo.h b/public.sdk/source/vst/moduleinfo/moduleinfo.h
index ecf528b..49f2827 100644
--- a/public.sdk/source/vst/moduleinfo/moduleinfo.h
+++ b/public.sdk/source/vst/moduleinfo/moduleinfo.h
@@ -39,6 +39,7 @@
#include <string>
#include <vector>
+#include <cstdint>
//------------------------------------------------------------------------
namespace Steinberg {

13
vst3sdk-fix-include-cstdint.patch Normal file
View File

@ -0,0 +1,13 @@
Submodule public.sdk contains modified content
diff --git a/public.sdk/source/vst/utility/stringconvert.h b/public.sdk/source/vst/utility/stringconvert.h
index ff910aa..9dbd984 100644
--- a/public.sdk/source/vst/utility/stringconvert.h
+++ b/public.sdk/source/vst/utility/stringconvert.h
@@ -38,6 +38,7 @@
#include "pluginterfaces/vst/vsttypes.h"
#include <string>
+#include <cstdint>
//------------------------------------------------------------------------
namespace VST3 {

13
vst3sdk-fix-limits-include-moduleinfoparser.patch
View File

@ -1,13 +0,0 @@
Submodule public.sdk contains modified content
diff --git a/public.sdk/source/vst/moduleinfo/moduleinfoparser.cpp b/public.sdk/source/vst/moduleinfo/moduleinfoparser.cpp
index b49b471..c99b7e2 100644
--- a/public.sdk/source/vst/moduleinfo/moduleinfoparser.cpp
+++ b/public.sdk/source/vst/moduleinfo/moduleinfoparser.cpp
@@ -39,6 +39,7 @@
#include "jsoncxx.h"
#include "pluginterfaces/base/ipluginbase.h"
#include <stdexcept>
+#include <limits>
//------------------------------------------------------------------------
namespace Steinberg::ModuleInfoLib {

23
vst3sdk-fix-std-atomic-for-gcc12.patch Normal file
View File

@ -0,0 +1,23 @@
diff -ur vst3sdk-3.7.4_build_25.orig/pluginterfaces/base/funknown.cpp vst3sdk-3.7.4_build_25/pluginterfaces/base/funknown.cpp
--- vst3sdk-3.7.4_build_25.orig/pluginterfaces/base/funknown.cpp 2022-01-18 10:42:29.305860504 +1000
+++ vst3sdk-3.7.4_build_25/pluginterfaces/base/funknown.cpp 2022-05-17 10:22:42.306950103 +1000
@@ -88,7 +88,7 @@
int32 PLUGIN_API atomicAdd (int32& var, int32 d)
{
#if SMTG_USE_STDATOMIC_H
- return atomic_fetch_add (reinterpret_cast<atomic_int_least32_t*> (&var), d) + d;
+ return std::atomic_fetch_add (reinterpret_cast<std::atomic_int_least32_t*> (&var), d) + d;
#else
#if SMTG_OS_WINDOWS
#ifdef __MINGW32__
diff -ur vst3sdk-3.7.4_build_25.orig/pluginterfaces/base/funknown.h vst3sdk-3.7.4_build_25/pluginterfaces/base/funknown.h
--- vst3sdk-3.7.4_build_25.orig/pluginterfaces/base/funknown.h 2022-01-18 10:42:29.305860504 +1000
+++ vst3sdk-3.7.4_build_25/pluginterfaces/base/funknown.h 2022-05-17 10:22:52.071191240 +1000
@@ -20,6 +20,7 @@
#include "pluginterfaces/base/ftypes.h"
#include "pluginterfaces/base/smartpointer.h"
#include <cstring>
+#include <atomic>
#if SMTG_CPP11_STDLIBSUPPORT
#include <type_traits>