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

Accepting request 1083301 from multimedia:apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1083301
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=110
This commit is contained in:
Dominique Leuenberger 2023-04-28 14:23:15 +00:00 committed by Git OBS Bridge
commit e79b094880
12 changed files with 99 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Audacity-3.2.5.tar.gz
View File

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

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

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

4
_service
View File

@ -2,8 +2,8 @@
<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.6_build_18</param>
<param name="version">3.7.6_build_18</param>
<param name="revision">v3.7.7_build_19</param>
<param name="version">3.7.7_build_19</param>
<param name="changesgenerate">enable</param>
<param name="filename">vst3sdk</param>
</service>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/steinbergmedia/vst3sdk/</param>
<param name="changesrevision">05c4a9763f311a58fe3f34b68a199e5eea92e2b4</param></service></servicedata>
<param name="changesrevision">358b72ee61bc67fb4592b0d492e0c6a1211ebf11</param></service></servicedata>

18
audacity-no_return_in_nonvoid.patch
View File

@ -1,5 +1,5 @@
diff --git a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c
index 8c1c7b5..e05c28d 100644
index 8c1c7b5a8..e05c28dd9 100644
--- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c
+++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c
@@ -600,6 +600,7 @@ double pv_get_effective_pos(Phase_vocoder x)
@ -11,7 +11,7 @@ index 8c1c7b5..e05c28d 100644
diff --git a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
index 37ab604..f434a67 100644
index 37ab60479..f434a674d 100644
--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c
@@ -603,7 +603,10 @@ LVAL xcleanup(void)
@ -27,7 +27,7 @@ index 37ab604..f434a67 100644
/* xtoplevel - special form 'top-level' */
diff --git a/lib-src/portsmf/allegro.cpp b/lib-src/portsmf/allegro.cpp
index a87117e..d471785 100644
index a87117e38..d4717855a 100644
--- a/lib-src/portsmf/allegro.cpp
+++ b/lib-src/portsmf/allegro.cpp
@@ -2905,6 +2905,9 @@ Alg_event_ptr &Alg_seq::operator[](int i)
@ -40,15 +40,3 @@ index a87117e..d471785 100644
}
#pragma warning(default: 4715)
diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp
index 9bd57e2..0e46c96 100644
--- a/src/widgets/NumericTextCtrl.cpp
+++ b/src/widgets/NumericTextCtrl.cpp
@@ -679,6 +679,7 @@ static const BuiltinFormatString BandwidthConverterFormats_[] = {
case NumericConverter::BANDWIDTH:
return WXSIZEOF(BandwidthConverterFormats_);
}
+ return WXSIZEOF(BandwidthConverterFormats_);
}
}

50
audacity.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Tue Apr 25 02:44:07 UTC 2023 - Konstantin Voinov <kv@kott.no-ip.biz>
- Use default compiler, upstream has fixed gcc13 build
- Update VST3SDK to version 3.7.7_build_19:
- Add patches to fix VST3SDK build with gcc13:
vst3sdk-fix-include-cstdint-for-gcc13.patch
vst3sdk-fix-limits-include-moduleinfoparser.patch
- Remove patches - fixed in upstream:
no-more-strip.patch
- Refresh patches:
audacity-no_return_in_nonvoid.patch
- Update to 3.3.0
Changes
* Some of the built-in effects are now realtime capable (Bass &
Treble, Distortion, Phaser, Reverb and Wahwah).
* #4352 Added a new effect: Shelf Filter.
* Added an initial (beta) version of Beats and Bars.
* #4414 Reworked the bottom toolbar dock:
* Project Sample Rate is now found in Audio Setup -> Audio
Settings (formerly known as Project Rate).
* The Snapping Toolbar (formerly known as Snap-To) is now
independent of the Selection Toolbar.
* Added a new Time Signature Toolbar (beta). It is hidden by default.
* #4212 Improved Zooming behavior slightly (more to come in the future).
* #4393 Added a new ruler, Linear (dB). This ruler goes from
0 dBFS to -∞ dBFS and better reflects the volume as shown in
the recording/playback meters.
* #3820 When copying clips between projects, you now can choose
between whether to copy smart clips or just the visible portion.
* #4133 Added a delete button to the Cut/Copy/Paste toolbar.
Bugfixes
* #1584 Audacity no longer dithers tracks unnecessarily.
* #2427 Linux playback now handles output latency better (less stutters).
* #3796 The EQ effect no longer resets clip names.
* #3801 Audacity no longer crashes when trying to load projects with
plugins that since have been deleted.
* #4417 Resampling a track no longer trims it.
Libraries
* FFmpeg 6 (avformat 60) is now supported.
* Moved from Breakpad to Crashpad.
* Extracted various libraries from within Audacity.
-------------------------------------------------------------------
Wed Apr 5 11:38:18 UTC 2023 - Dave Plater <davejplater@gmail.com>

23
audacity.spec
View File

@ -24,7 +24,7 @@
%endif
Name: audacity
Version: 3.2.5
Version: 3.3.0
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,19 +33,17 @@ 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.6_build_18.tar.xz
Source3: vst3sdk-3.7.7_build_19.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
Patch3: no-more-strip.patch
Patch95: vst3sdk-fix-include-cstdint-for-gcc13.patch
Patch96: vst3sdk-fix-limits-include-moduleinfoparser.patch
BuildRequires: cmake >= 3.16
BuildRequires: desktop-file-utils
# Build with gcc12 until upstream catches up with gcc13
#BuildRequires: gcc-c++
BuildRequires: gcc12
BuildRequires: gcc12-c++
BuildRequires: gcc-c++
#!BuildIgnore: gstreamer-0_10-plugins-base
BuildRequires: hicolor-icon-theme
BuildRequires: libmp3lame-devel
@ -115,7 +113,9 @@ physical memory size can be edited.
%prep
%setup -q -n %{name}-Audacity-%{version}
%autopatch -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions.
@ -126,6 +126,8 @@ touch include/RevisionIdent.h
%if %{with vst}
tar xf %{SOURCE3} --strip-components=1 --one-top-level=vst3sdk
%patch95 -p1 -d vst3sdk
%patch96 -p1 -d vst3sdk
%endif
%build
@ -134,9 +136,6 @@ then
export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig"
fi
export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)"
export CXXFLAGS="$CFLAGS -std=gnu++17"
export CC="/usr/bin/gcc-12"
export CXX="/usr/bin/g++-12"
%cmake \
-DAUDACITY_REV_TIME=$(date -u -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ") \
@ -182,7 +181,7 @@ ldconfig %{_libdir}/%{name}
%files
%defattr(-,root,root)
%doc README.txt
%doc README.md
%license LICENSE.txt LICENSE_NYQUIST.txt
%{_bindir}/%{name}
%{_libdir}/%{name}

25
no-more-strip.patch
View File

@ -1,25 +0,0 @@
diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
index 47682eb..8f63837 100644
--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
@@ -469,13 +469,13 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
target_link_options( ${TARGET} PRIVATE ${LOPTS} )
target_link_libraries( ${TARGET} PUBLIC ${LIBRARIES} )
- if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
- add_custom_command(
- TARGET "${TARGET}"
- POST_BUILD
- COMMAND $<IF:$<CONFIG:Debug>,echo,strip> -x $<TARGET_FILE:${TARGET}>
- )
- endif()
+ # if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
+ # add_custom_command(
+ # TARGET "${TARGET}"
+ # POST_BUILD
+ # COMMAND $<IF:$<CONFIG:Debug>,echo,strip> -x $<TARGET_FILE:${TARGET}>
+ # )
+ # endif()
if( NOT REAL_LIBTYPE STREQUAL "MODULE" )
if( CMAKE_SYSTEM_NAME MATCHES "Windows" )

3
vst3sdk-3.7.6_build_18.tar.xz
View File

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

3
vst3sdk-3.7.7_build_19.tar.xz Normal file
View File

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

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

@ -0,0 +1,13 @@
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-limits-include-moduleinfoparser.patch Normal file
View File

@ -0,0 +1,13 @@
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 {