From 58e86b3ff60dc0a8f81cc661fa78fe5f97ea96eba82ac31cb43c05561f097d9e Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 14 Apr 2022 09:32:15 +0000 Subject: [PATCH] Accepting request 970098 from home:plater Added libopus build dependency and "-DCMAKE_SKIP_RPATH:BOOL=on" to fix Leap builds. Update to 3.1.3 * remove patches, now upstream: 0001-Adds-an-option-to-disable-Conan.patch 0001-Fixes-wxwidgets-fixup-script.patch 0001-Scope-libraries-required-by-the-optional-features.patch Refresh missing-include.patch OBS-URL: https://build.opensuse.org/request/show/970098 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=174 --- audacity.changes | 15 +++++++++++++++ audacity.spec | 4 +++- missing-include.patch | 16 ++++++++-------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/audacity.changes b/audacity.changes index aa8df58..dc28779 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 14 07:44:51 UTC 2022 - Dave Plater + +- Added libopus build dependency and "-DCMAKE_SKIP_RPATH:BOOL=on" + to fix Leap builds. + ------------------------------------------------------------------- Wed Apr 13 23:35:32 UTC 2022 - Konstantin Voinov @@ -6,6 +12,15 @@ Wed Apr 13 23:35:32 UTC 2022 - Konstantin Voinov 0001-Adds-an-option-to-disable-Conan.patch 0001-Fixes-wxwidgets-fixup-script.patch 0001-Scope-libraries-required-by-the-optional-features.patch + Refresh missing-include.patch + * Improved performance of loading in projects + * Added snap guides when resizing clips + * Added new shortcuts for looping: + Shift+L for "Set Loop to Selection", + Shift+Alt+L for "Clear Looping Region" + * Added a new selection region indicator in the timeline + * Re-added the Quick Play indicator + * Lot of bug fixes ------------------------------------------------------------------- Mon Jan 31 08:17:38 UTC 2022 - Dave Plater diff --git a/audacity.spec b/audacity.spec index 78befbb..d65ed75 100644 --- a/audacity.spec +++ b/audacity.spec @@ -33,7 +33,7 @@ Source2: audacity-rpmlintrc 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: missing-include.patch +Patch2: missing-include.patch Patch3: no-more-strip.patch BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils @@ -58,6 +58,7 @@ BuildRequires: pkgconfig(lilv-0) >= 0.24.6 BuildRequires: pkgconfig(lv2) >= 1.16.0 BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(serd-0) >= 0.30.2 BuildRequires: pkgconfig(shared-mime-info) @@ -136,6 +137,7 @@ fi export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)" export CXXFLAGS="$CFLAGS -std=gnu++17" %cmake \ + -DCMAKE_SKIP_RPATH:BOOL=on \ -DAUDACITY_REV_TIME=$(date -u -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ") \ -DAUDACITY_REV_LONG=STRING:%{version} \ -DAUDACITY_BUILD_LEVEL=1 \ diff --git a/missing-include.patch b/missing-include.patch index d144739..e7fb456 100644 --- a/missing-include.patch +++ b/missing-include.patch @@ -1,19 +1,19 @@ -Index: audacity-Audacity-3.1.3-beta-1/libraries/lib-utility/BufferedStreamReader.h +Index: b/libraries/lib-utility/BufferedStreamReader.h =================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/libraries/lib-utility/BufferedStreamReader.h -+++ audacity-Audacity-3.1.3-beta-1/libraries/lib-utility/BufferedStreamReader.h -@@ -12,6 +12,7 @@ - +--- a/libraries/lib-utility/BufferedStreamReader.h 2021-12-22 17:35:36.000000000 +0200 ++++ b/libraries/lib-utility/BufferedStreamReader.h 2022-04-14 09:56:19.275619728 +0200 +@@ -13,6 +13,7 @@ #include + #include #include +#include #include /*! -Index: audacity-Audacity-3.1.3-beta-1/libraries/lib-xml/XMLAttributeValueView.cpp +Index: b/libraries/lib-xml/XMLAttributeValueView.cpp =================================================================== ---- audacity-Audacity-3.1.3-beta-1.orig/libraries/lib-xml/XMLAttributeValueView.cpp -+++ audacity-Audacity-3.1.3-beta-1/libraries/lib-xml/XMLAttributeValueView.cpp +--- a/libraries/lib-xml/XMLAttributeValueView.cpp 2021-12-22 17:35:36.000000000 +0200 ++++ b/libraries/lib-xml/XMLAttributeValueView.cpp 2022-04-14 09:56:19.275619728 +0200 @@ -12,6 +12,7 @@ #include "FromChars.h"