commit f3b03ffe819fd14dd8ab296205cddf1e99b0edb6 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Feb 22 04:38:29 2018 +0000 Update to 2.2.2 .gitignore | 1 + audacity-2.0.2-desktop.in.patch | 21 ++++----- audacity-2.0.3-non-dl-ffmpeg.patch | 20 --------- audacity-2.0.4-equalization-segfault.patch | 50 ---------------------- audacity-2.2.0-no-local-includes.patch | 13 ++++++ audacity-freeworld.spec | 69 ++++++++++++++++++++++-------- sources | 2 +- 7 files changed, 78 insertions(+), 98 deletions(-) --- diff --git a/.gitignore b/.gitignore index f3bcc48..0522e62 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/audacity-2.0.2-desktop.in.patch b/audacity-2.0.2-desktop.in.patch index c302c98..4604012 100644 --- a/audacity-2.0.2-desktop.in.patch +++ b/audacity-2.0.2-desktop.in.patch @@ -1,21 +1,22 @@ ---- src/audacity.desktop.in.orig 2012-08-21 18:48:21.000000000 +1000 -+++ src/audacity.desktop.in 2012-08-21 22:34:31.376045927 +1000 -@@ -5,16 +5,16 @@ - GenericName=Sound Editor - GenericName[de]=Audio-Editor - GenericName[ru]=Редактор звуковых файлов +--- ./src/audacity.desktop.in.orig 2018-02-11 03:16:28.828537405 +0000 ++++ ./src/audacity.desktop.in 2018-02-11 03:18:24.112709701 +0000 +@@ -16,7 +16,7 @@ GenericName[ru]=Редактор зву� + GenericName[uk]=Редактор звукових файлів + GenericName[zh_CN]=音频编辑器 + GenericName[zh_TW]=音訊編輯器 -Comment=Record and edit audio files +Comment=Record and edit audio files with multitrack capability - Comment[de]=Audio-Dateien aufnehmen und bearbeiten - Comment[ru]=Запись и редактирование звуковых файлов - + Comment[ar]=سجل و حرر ملفات صوت + Comment[ca]=Enregistreu i editeu els fitxers d'àudio + Comment[da]=Optag og rediger lydfiler +@@ -36,9 +36,9 @@ Comment[zh_TW]=錄音和編輯音訊檔� Icon=@AUDACITY_NAME@ Type=Application -Categories=AudioVideo;Audio;AudioVideoEditing; +Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing; - Exec=@AUDACITY_NAME@ %F + Exec=env UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F StartupNotify=false Terminal=false -MimeType=application/x-audacity-project;@MIMETYPES@ diff --git a/audacity-2.2.0-no-local-includes.patch b/audacity-2.2.0-no-local-includes.patch new file mode 100644 index 0000000..ec5b8f8 --- /dev/null +++ b/audacity-2.2.0-no-local-includes.patch @@ -0,0 +1,13 @@ +--- ./src/AudioIO.cpp.orig 2017-12-03 17:58:41.137697095 +0000 ++++ ./src/AudioIO.cpp 2017-12-03 18:02:25.447946534 +0000 +@@ -451,8 +451,8 @@ writing audio. + #endif + #define ROUND(x) (int) ((x)+0.5) + //#include <string.h> +- #include "../lib-src/portmidi/pm_common/portmidi.h" +- #include "../lib-src/portaudio-v19/src/common/pa_util.h" ++ #include "portmidi.h" ++ #include "../lib-src/portaudio-v19/src/common/pa_util.h" + #include "NoteTrack.h" + #endif + diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 19e5efe..7a95098 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -1,12 +1,13 @@ # invoke with: rpmbuild --without mp3 audacity-freeworld.spec to undefine mp3. %bcond_without mp3 +%bcond_without ffmpeg #global commit0 53a5c930a4b5b053ab06a8b975458fc51cf41f6c #global shortcommit0 %(c=%#{commit0}; echo ${c:0:7}) Name: audacity-freeworld -Version: 2.2.0 +Version: 2.2.2 Release: 1%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia @@ -21,19 +22,20 @@ 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} -#%#define tartopdir audacity-%#{commit0} +%define tartopdir audacity-minsrc-%{version}-rc1 +#define tartopdir audacity-%#{commit0} # manual can be installed from the base Fedora Audacity package. -# Patch1: audacity-2.0.4-libmp3lame-default.patch -# Patch2: audacity-1.3.9-libdir.patch +Patch1: audacity-2.0.4-libmp3lame-default.patch +Patch2: audacity-1.3.9-libdir.patch # add audio/x-flac # remove audio/mpeg, audio/x-mp3 # enable startup notification # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature -# Patch3: audacity-2.0.2-desktop.in.patch +Patch3: audacity-2.0.2-desktop.in.patch Patch4: audacity-2.0.6-non-dl-ffmpeg.patch +Patch5: audacity-2.2.0-no-local-includes.patch Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -46,12 +48,19 @@ BuildRequires: gettext BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel BuildRequires: libid3tag-devel -BuildRequires: libmad-devel BuildRequires: taglib-devel BuildRequires: libogg-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel +#checking for LV2... no +#configure: LV2 libraries are NOT available as system libraries +#BuildRequires: lv2-devel +# system portaudio fails to build +# http://rglinuxtech.com/?p=2093 #BuildRequires: portaudio-devel >= 19-16 +#checking for PORTMIDI... no +#configure: portmidi library is NOT available as system library +BuildRequires: portmidi-devel BuildRequires: soundtouch-devel BuildRequires: soxr-devel BuildRequires: vamp-plugin-sdk-devel >= 2.0 @@ -65,9 +74,12 @@ BuildRequires: libappstream-glib %endif %if %{with mp3} BuildRequires: twolame-devel +BuildRequires: lame-devel +BuildRequires: libmad-devel %endif +%if %{with ffmpeg} BuildRequires: ffmpeg-devel -BuildRequires: lame-devel +%endif # For new symbols in portaudio Requires: portaudio%{?_isa} >= 19-16 @@ -100,8 +112,21 @@ do sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i done -#patch3 -b .desktop.old +%patch3 -p1 -b .desktop %patch4 -p1 -b .2.0.6-non-dl-ffmpeg +%patch5 -p1 -b .nolocal + +# ensure we use the system headers for these, note we do this after +# configure as it wants to run sub-configures in these dirs +#in ffmpeg FileDialog lame libnyquist libsndfile libsoxr libvamp lv2 portburn portmidi portmixer portsmf sbsms twolame; do + +# 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 + +for i in ffmpeg lame libsndfile libsoxr libvamp twolame; do + rm -r lib-src/$i +done %build @@ -125,26 +150,30 @@ export WX_CONFIG=wx-config-3.0-gtk2 --with-expat=system \ --with-soundtouch=system \ --with-libvamp=system \ + --with-lv2 \ + --with-portaudio=local \ + --with-midi \ + --with-portmidi \ +%if %{with ffmpeg} --with-ffmpeg=system \ - --with-libmad=system \ +%else + --without-ffmpeg \ +%endif %if %{with mp3} + --with-libmad=system \ --with-libtwolame=system \ + --with-lame=system \ %else + --without-libmad \ --without-libtwolame \ + --without-lame \ %endif - --with-lame=system \ %ifnarch %{ix86} x86_64 --disable-sse \ %else %{nil} %endif -# ensure we use the system headers for these, note we do this after -# configure as it wants to run sub-configures in these dirs -for i in ffmpeg libresample libsoxr libvamp; do - rm -rf lib-src/$i -done - # _smp_mflags cause problems make @@ -215,6 +244,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Feb 22 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 2.2.2-1 +- Update to 2.2.2 + +* Thu Feb 01 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 2.2.1-1 +- Update to 2.2.1 + * Sun Dec 03 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 2.2.0-1 - Update to 2.2.0 diff --git a/sources b/sources index baf3f1f..16635a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3b81c7378b1602e9982b7836eb052e5 audacity-minsrc-2.2.0.tar.xz +0085716780cf618918034abadeed8629 audacity-minsrc-2.2.2.tar.xz