$ git diff --patch-with-stat --summary f839bfeb7213e841263cca0b86d49c1fadbff18d..22507d00d9733edd912603110a793680dc0443a8
.abf.yml | 2 +-
audacity-2.4.2-default-theme-dark.patch | 15 +++++++
audacity.spec | 80 ++++++++++++++++++++++-----------
3 files changed, 70 insertions(+), 27 deletions(-)
create mode 100644 audacity-2.4.2-default-theme-dark.patch
diff --git a/.abf.yml b/.abf.yml
index f4614bc..a4aca4a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- audacity-minsrc-2.3.3.tar.xz: cff2d959450aa859fd9c8612b30451ceee27cad8
+ audacity-Audacity-2.4.2.tar.gz: 689451349c7d7dc34a1927498b23ada96390e82c
diff --git a/audacity-2.4.2-default-theme-dark.patch b/audacity-2.4.2-default-theme-dark.patch
new file mode 100644
index 0000000..325e16a
--- /dev/null
+++ b/audacity-2.4.2-default-theme-dark.patch
@@ -0,0 +1,15 @@
+diff -up audacity-minsrc-2.4.2/src/Theme.cpp.dark audacity-minsrc-2.4.2/src/Theme.cpp
+--- audacity-minsrc-2.4.2/src/Theme.cpp.dark 2020-05-30 13:55:53.000000000 +0200
++++ audacity-minsrc-2.4.2/src/Theme.cpp 2020-06-30 12:13:36.704683529 +0200
+@@ -1299,11 +1299,7 @@ void auStaticText::OnPaint(wxPaintEvent
+ }
+
+ constexpr int defaultTheme =
+-#ifdef EXPERIMENTAL_DA
+ 2 // "dark"
+-#else
+- 1 // "light"
+-#endif
+ ;
+
+ ChoiceSetting GUITheme{
diff --git a/audacity.spec b/audacity.spec
index 1fe14bc..098e4df 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,17 +1,24 @@
%define fversion %{version}
+%define oname Audacity
%define _disable_lto 1
+%define _disable_ld_no_undefined 1
Summary: Free Audio Editor With Effects/Analysis Tools
Name: audacity
-Version: 2.3.3
-Release: 1
+Version: 2.4.2
+Release: 2
License: GPLv2+
Group: Sound
URL: https://www.audacityteam.org/
-Source0: https://www.fosshub.com/Audacity.html/audacity-minsrc-%{version}.tar.xz
+Source0: https://github.com/audacity/audacity/archive/Audacity-%{version}/%{name}-%{oname}-%{version}.tar.gz
+# As of 2.4.0 Audacity from audacity website not contains configure. So, we switch source to GitHub
+# As of 2.4.2 Audacity from both sources not contains configure, so we switch to cmake.
+#Source0: https://www.fosshub.com/Audacity.html/audacity-minsrc-%{version}.tar.xz
Source100: %{name}.rpmlintrc
-#Patch1: audacity-ffmpeg.patch
+Patch0: audacity-2.4.2-default-theme-dark.patch
+
BuildRequires: autoconf2.5
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: imagemagick
BuildRequires: lame-devel
@@ -20,26 +27,38 @@ BuildRequires: zip
BuildRequires: ffmpeg-devel
BuildRequires: gettext-devel
BuildRequires: jpeg-devel
-BuildRequires: wxgtku3.0-devel
+# Is in unsupported. So leave it disable
+#BuildRequires: portmidi-devel
+BuildRequires: wxgtku3.1-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(flac++)
BuildRequires: pkgconfig(id3tag)
BuildRequires: pkgconfig(jack)
+BuildRequires: pkgconfig(lv2)
BuildRequires: pkgconfig(mad)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(speex)
+BuildRequires: pkgconfig(soxr)
+BuildRequires: pkgconfig(suil-0)
+BuildRequires: pkgconfig(lilv-0)
+BuildRequires: pkgconfig(serd-0)
+BuildRequires: pkgconfig(sord-0)
+BuildRequires: pkgconfig(sratom-0)
BuildRequires: pkgconfig(twolame)
BuildRequires: pkgconfig(vamp-sdk)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(zlib)
-BuildRequires: cmake
-BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python)
+BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtk+-x11-3.0)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
%description
Audacity is a program that lets you manipulate digital audio waveforms.
@@ -52,11 +71,15 @@ It also has a built-in amplitude envelope editor, a customizable spectrogram
mode and a frequency analysis window for audio analysis applications.
%prep
-%setup -q -n %{name}-minsrc-%{fversion}
-#apply_patches
+%setup -q -n %{name}-%{oname}-%{fversion}
+%autopatch -p1
chmod 644 *.txt
%build
+export CC=gcc
+export CXX=g++
+
+[ ! -f src/RevisionIdent.h ] && echo ' ' > src/RevisionIdent.h
#export PATH=$PATH:`pwd`
#export LDFLAGS=-lz
#export CFLAGS="%{optflags}"
@@ -66,26 +89,30 @@ chmod 644 *.txt
#export OBJCXX=%__cxx
#export LD=%__cxx
-./configure \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --mandir=%{_mandir} \
- --enable-optimise \
- --enable-unicode \
- --with-vorbis=system \
- --with-libmad=system \
- --with-libsndfile=system \
- --with-libsamplerate \
- --with-id3tag=system \
- --with-soundtouch=system \
- --with-portmixer \
- --with-portaudio \
- --with-libtwolame=system \
- --with-ffmpeg
+#./configure \
+# --prefix=%{_prefix} \
+# --libdir=%{_libdir} \
+# --mandir=%{_mandir} \
+# --enable-optimise \
+# --enable-unicode \
+# --with-vorbis=system \
+# --with-libmad=system \
+# --with-libsndfile=system \
+# --with-libsamplerate \
+# --with-id3tag=system \
+# --with-soundtouch=system \
+# --with-portmixer \
+# --with-portaudio \
+# --with-libtwolame=system \
+# %ifnarch %ix86 x86_64
+# --enable-sse=no \
+# %endif
+# --with-ffmpeg
+%cmake -DCMAKE_BUILD_TYPE=Release
%make_build
%install
-%make_install
+%make_install -C build
%find_lang %{name}
@@ -107,6 +134,7 @@ desktop-file-install \
%{_datadir}/audacity
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/audacity.*
+%{_datadir}/icons/hicolor/*x*/audacity.png
%{_datadir}/pixmaps/*
%{_datadir}/appdata/audacity.appdata.xml
%{_datadir}/mime/packages/audacity.xml