commit 8eb6c033f30f616867f13afc21d90076e9bc9374 Author: David Timms <dtimms(a)iinet.net.au&gt; Date: Fri Nov 29 21:11:52 2019 +1100 Update to Audacity 2.3.3. Modify wxWidgets build require to wxGTK3 (gtk3 version). Modify libdir patch for 2.3.3. Fix -manual file archive dropping the leading help/ in path. Disable twolame for EPEL-8 as the -devel package isn't available. .gitignore | 3 ++- audacity-2.3.2-libdir.patch | 11 ----------- audacity-2.3.3-libdir.patch | 15 +++++++++++++++ audacity-freeworld.spec | 38 +++++++++++++++++++++++++++++++++----- sources | 2 +- 5 files changed, 51 insertions(+), 18 deletions(-) --- diff --git a/.gitignore b/.gitignore index e448c42..964bc38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/audacity-minsrc-2.3.2.tar.xz +/audacity-minsrc-2.3.3.tar.xz + diff --git a/audacity-2.3.3-libdir.patch b/audacity-2.3.3-libdir.patch new file mode 100644 index 0000000..2659a0c --- /dev/null +++ b/audacity-2.3.3-libdir.patch @@ -0,0 +1,15 @@ +--- ./src/effects/ladspa/LadspaEffect.cpp.orig 2019-10-22 07:29:41.000000000 +1100 ++++ ./src/effects/ladspa/LadspaEffect.cpp 2019-11-10 09:44:41.865684664 +1100 +@@ -378,11 +378,10 @@ + #else + + pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa")); ++ pathList.push_back(wxT("/usr/%{_lib}/ladspa")); + #if defined(__LP64__) +- pathList.push_back(wxT("/usr/local/lib64/ladspa")); + pathList.push_back(wxT("/usr/lib64/ladspa")); + #endif +- pathList.push_back(wxT("/usr/local/lib/ladspa")); + pathList.push_back(wxT("/usr/lib/ladspa")); + pathList.push_back(wxT(LIBDIR) wxT("/ladspa")); + diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 02b5bf0..b57840c 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -8,8 +8,8 @@ Name: audacity-freeworld -Version: 2.3.2 -Release: 2%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: https://www.audacityteam.org @@ -28,7 +28,7 @@ Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar. # manual can be installed from the base Fedora Audacity package. Patch1: audacity-2.2.1-libmp3lame-default.patch -Patch2: audacity-2.3.2-libdir.patch +Patch2: audacity-2.3.3-libdir.patch # add audio/x-flac # remove audio/mpeg, audio/x-mp3 # enable startup notification @@ -42,6 +42,9 @@ Obsoletes: audacity-nonfree < %{version}-%{release} BuildRequires: automake BuildRequires: autoconf BuildRequires: gettext-devel +%if 0%{?rhel} == 7 +BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel +%endif BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libtool @@ -56,7 +59,11 @@ BuildRequires: lame-devel BuildRequires: libid3tag-devel BuildRequires: libmad-devel BuildRequires: taglib-devel +%if 0%{?rhel} && 0%{?rhel} == 8 +#note: epel-8 currently doesn't have twolame-devel. +%else BuildRequires: twolame-devel +%endif BuildRequires: libogg-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel @@ -75,12 +82,13 @@ BuildRequires: soxr-devel BuildRequires: vamp-plugin-sdk-devel >= 2.0 BuildRequires: zip BuildRequires: zlib-devel +BuildRequires: python2 #BuildRequires: wxGTK3-devel # But we will actually use the --toolkit=gtk2 version using --with-wx-version -BuildRequires: compat-wxGTK3-gtk2-devel +#BuildRequires: compat-wxGTK3-gtk2-devel +BuildRequires: wxGTK3-devel %if 0%{?rhel} >= 8 || 0%{?fedora} BuildRequires: libappstream-glib -BuildRequires: python2 %endif %if %{with ffmpeg} @@ -122,8 +130,17 @@ grep -q -s libmp3lame.so\| * -R && exit 1 %if (0%{?fedora} && 0%{?fedora} < 28) export WX_CONFIG=wx-config-3.0-gtk2 %endif +%if 0%{?rhel} == 7 +export WX_CONFIG=wx-config-3.0 +%endif +%if %{with ffmpeg} && %{with compat_ffmpeg} export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig +%endif + +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-7/enable +%endif aclocal -I m4 autoconf @@ -140,7 +157,11 @@ autoconf --without-libsamplerate \ --with-lame=system \ --with-libmad=system \ +%if 0%{?rhel} == 8 + --without-libtwolame \ +%else --with-libtwolame=system \ +%endif --with-libflac=system \ --with-ladspa \ --with-vorbis=system \ @@ -226,6 +247,13 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Sat Nov 23 2019 David Timms <iinet.net.au@dtimms> - 2.3.3-1 +- Update to Audacity 2.3.3. +- Modify wxWidgets build require to wxGTK3 (gtk3 version). +- Modify libdir patch for 2.3.3. +- Fix -manual file archive dropping the leading help/ in path. +- Disable twolame for EPEL-8 as the -devel package isn't available. + * Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.3.2-2 - Rebuild for new ffmpeg version diff --git a/sources b/sources index 1acec05..163c219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ddafe07f4ecb6c650b371bfd016cfa2 audacity-minsrc-2.3.2.tar.xz +SHA512 (audacity-minsrc-2.3.3.tar.xz) = 4be5f766e9d68d71e83bb1c972dc0390da3736228a5d4af514913aec103a0b4bc9858e77b0377681ae9137ab92596bcedc93221a71c32876e4838d00d5681806