commit 7241004c5327c62d1871c1d3c13d7cc323d581fc Author: David Timms <dtimms(a)iinet.net.au&gt; Date: Thu Oct 4 23:10:12 2018 +1000 Update to Audacity 2.3.0 release. change mp3 capability to be always present rather than a compile option. Modify audacity-2.2.1-libdir.patch and audacity-2.2.1-libmp3lame-default.patch to apply the rpm macro path directly. Add grep check to fail if RPMLIB is found in modified source. Fix libid3tag configure option. .gitignore | 7 +--- audacity-2.2.1-libdir.patch | 2 +- audacity-2.2.1-libmp3lame-default.patch | 2 +- audacity-freeworld.spec | 63 +++++++++++++++------------------ sources | 2 +- 5 files changed, 33 insertions(+), 43 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0522e62..ffbc4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -audacity-minsrc-2.1.1.tar.xz -audacity-minsrc-2.1.2.tar.xz -/audacity-53a5c930a4b5b053ab06a8b975458fc51cf41f6c.tar.gz -/audacity-minsrc-2.1.3.tar.xz -/audacity-minsrc-2.2.0.tar.xz -/audacity-minsrc-2.2.2.tar.xz +/audacity-minsrc-2.3.0.tar.xz diff --git a/audacity-2.2.1-libdir.patch b/audacity-2.2.1-libdir.patch index eea4edb..0831862 100644 --- a/audacity-2.2.1-libdir.patch +++ b/audacity-2.2.1-libdir.patch @@ -5,7 +5,7 @@ pathList.Add(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa")); - pathList.Add(wxT("/usr/local/lib/ladspa")); -+ pathList.Add(wxT("/usr/__RPM_LIB__/ladspa")); ++ pathList.Add(wxT("/usr/%{_lib}/ladspa")); pathList.Add(wxT("/usr/lib/ladspa")); pathList.Add(wxT(LIBDIR) wxT("/ladspa")); diff --git a/audacity-2.2.1-libmp3lame-default.patch b/audacity-2.2.1-libmp3lame-default.patch index 39d8fbc..b322cbc 100644 --- a/audacity-2.2.1-libmp3lame-default.patch +++ b/audacity-2.2.1-libmp3lame-default.patch @@ -4,7 +4,7 @@ //JKC: Would like to put module loading here. -+ gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("__RPM_LIBDIR__/libmp3lame.so.0")); ++ gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("%{_libdir}/libmp3lame.so.0")); + // More initialization diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 29b09f6..2765b7e 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -1,5 +1,5 @@ -# invoke with: rpmbuild --without mp3 audacity-freeworld.spec to undefine mp3. -%bcond_without mp3 +# Compile options: + %bcond_without ffmpeg %bcond_with local_ffmpeg @@ -8,8 +8,8 @@ Name: audacity-freeworld -Version: 2.2.2 -Release: 6%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -23,8 +23,8 @@ Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar. #Source0: https://github.com/audacity/#{realname}/archive/#{commit0}/#{realname}-#{... # ie wget https://github.com/audacity/audacity/archive/ecdb1d81c9312789c6233aba2190... -%define tartopdir audacity-minsrc-%{version}-rc1 -#define tartopdir audacity-%#{commit0} +%define tartopdir audacity-minsrc-%{version} +#define tartopdir audacity-#{commit0} # manual can be installed from the base Fedora Audacity package. @@ -43,6 +43,8 @@ Obsoletes: audacity-nonfree < %{version}-%{release} BuildRequires: automake BuildRequires: autoconf BuildRequires: gettext-devel +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -51,8 +53,11 @@ BuildRequires: flac-devel BuildRequires: gettext BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel +BuildRequires: lame-devel BuildRequires: libid3tag-devel +BuildRequires: libmad-devel BuildRequires: taglib-devel +BuildRequires: twolame-devel BuildRequires: libogg-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel @@ -76,11 +81,7 @@ BuildRequires: compat-wxGTK3-gtk2-devel %if 0%{?rhel} >= 8 || 0%{?fedora} BuildRequires: libappstream-glib %endif -%if %{with mp3} -BuildRequires: twolame-devel -BuildRequires: lame-devel -BuildRequires: libmad-devel -%endif + %if %{with ffmpeg} BuildRequires: ffmpeg-devel %endif @@ -103,24 +104,14 @@ This build has support for mp3 and ffmpeg import/export. # Substitute hardcoded library paths. %patch1 -p1 -b .libmp3lame-default %patch2 -p1 -b .libdir -for i in src/AudacityApp.cpp src/effects/ladspa/LadspaEffect.cpp -do - cp $i $i.tmp - sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i - sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i - diff $i.tmp $i -s || : - rm $i.tmp -done -grep -q -s __RPM_LIB * -R && exit 1 +grep -s __RPM_LIB * -R && exit 1 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". for i in locale/*.po src/export/ExportMP3.cpp do - cp $i $i.tmp sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i - diff $i.tmp $i -s || : - rm $i.tmp done +grep -q -s libmp3lame.so\| * -R && exit 1 %patch3 -p1 -b .desktop %patch4 -p1 -b .non-dl-ffmpeg @@ -131,6 +122,8 @@ done export WX_CONFIG=wx-config-3.0-gtk2 %endif +export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig + aclocal -I m4 autoconf @@ -144,10 +137,13 @@ autoconf --with-libsoxr=system \ --without-libresample \ --without-libsamplerate \ + --with-lame=system \ + --with-libmad=system \ + --with-libtwolame=system \ --with-libflac=system \ --with-ladspa \ --with-vorbis=system \ - --with-id3tag=system \ + --with-libid3tag=system \ --with-expat=system \ --with-soundtouch=system \ --with-libvamp=system \ @@ -162,22 +158,13 @@ autoconf %else --without-ffmpeg \ %endif -%if %{with mp3} - --with-libmad=system \ - --with-libtwolame=system \ - --with-lame=system \ -%else - --without-libmad \ - --without-libtwolame \ - --without-lame \ -%endif %ifnarch %{ix86} x86_64 --disable-sse \ %else %{nil} %endif -# http://rglinuxtech.com/?p=2093 +# portaudio use local: http://rglinuxtech.com/?p=2093 #--enable-shared --with-ffmpeg --with-lame --with-libflac --with-libid3tag --with-libmad --with-libtwolame #--with-libvorbis --with-lv2 --with-portaudio=local --with-midi --with-portmidi @@ -238,6 +225,14 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Mon Oct 1 2018 David Timms <iinet.net.au@dtimms> - 2.3.0-1 +- Update to Audacity 2.3.0 release. +- change mp3 capability to be always present rather than a compile option. +- Modify audacity-2.2.1-libdir.patch and audacity-2.2.1-libmp3lame-default.patch + to apply the rpm macro path directly. +- Add grep check to fail if RPMLIB is found in modified source. +- Fix libid3tag configure option. + * Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 16635a7..ac08a6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0085716780cf618918034abadeed8629 audacity-minsrc-2.2.2.tar.xz +cdfbd56f9817f000cf9c2ad986e1d84c audacity-minsrc-2.3.0.tar.xz