From 1bcfef6db79ebd67fcd36233e8cd526208fb344f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Feb 09 2021 22:18:02 +0000 Subject: 2.4.2 --- diff --git a/.gitignore b/.gitignore index dfda940..0ddec72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /audacity-minsrc-2.3.3.tar.xz /audacity-manual-2.3.3.zip +/audacity-minsrc-2.4.2.tar.xz +/audacity-manual-2.4.2.zip diff --git a/audacity-2.2.1-libmp3lame-default.patch b/audacity-2.2.1-libmp3lame-default.patch deleted file mode 100644 index b322cbc..0000000 --- a/audacity-2.2.1-libmp3lame-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/AudacityApp.cpp.orig 2018-02-25 02:45:09.025766328 +0000 -+++ ./src/AudacityApp.cpp 2018-02-25 02:47:07.371907945 +0000 -@@ -1508,6 +1508,8 @@ bool AudacityApp::OnInit() - - //JKC: Would like to put module loading here. - -+ gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("%{_libdir}/libmp3lame.so.0")); -+ - // More initialization - - InitDitherers(); diff --git a/audacity-2.3.3-appdata.patch b/audacity-2.3.3-appdata.patch deleted file mode 100644 index fc6ac70..0000000 --- a/audacity-2.3.3-appdata.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- help/audacity.appdata.xml.orig 2018-11-02 16:56:11.000000000 +0000 -+++ help/audacity.appdata.xml 2020-06-15 10:47:33.359600935 +0100 -@@ -1,7 +1,8 @@ - - - org.audacityteam.Audacity -- audacity.desktop -+ audacity.desktop -+ - GPL-2.0 and CC-BY-3.0 - CC0-1.0 - Audacity diff --git a/audacity-2.3.3-desktop.in.patch b/audacity-2.3.3-desktop.in.patch deleted file mode 100644 index 7a31ee8..0000000 --- a/audacity-2.3.3-desktop.in.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/audacity.desktop.in.original 2020-05-03 12:35:11.935438397 +0100 -+++ src/audacity.desktop.in 2020-05-03 12:49:40.221602525 +0100 -@@ -20,7 +20,7 @@ - GenericName[uk]=Редактор звукових файлів - GenericName[zh_CN]=音频编辑器 - GenericName[zh_TW]=音訊編輯器 --Comment=Record and edit audio files -+Comment=Record and edit audio files with multitrack capability - Comment[ar]=سجل و حرر ملفات صوت - Comment[ca]=Enregistreu i editeu els fitxers d'àudio - Comment[da]=Optag og rediger lydfiler -@@ -44,9 +44,9 @@ - Icon=@AUDACITY_NAME@ - - Type=Application --Categories=AudioVideo;Audio;AudioVideoEditing; -+Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing; - --Exec=env UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F -+Exec=env GDK_BACKEND=x11 UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F - StartupNotify=false - Terminal=false --MimeType=application/x-audacity-project;@MIMETYPES@ -+MimeType=application/x-audacity-project;@MIMETYPES@audio/x-aifc;audio/x-mp3;audio/midi; diff --git a/audacity-2.3.3-libdir.patch b/audacity-2.3.3-libdir.patch deleted file mode 100644 index 2659a0c..0000000 --- a/audacity-2.3.3-libdir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./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.spec b/audacity.spec index 02abb72..7cd6a3d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -3,29 +3,17 @@ %bcond_with ffmpeg %bcond_with local_ffmpeg -%if 0%{?fedora} > 27 -%bcond_without compat_ffmpeg -%else -%bcond_with compat_ffmpeg -%endif - -# Upstream looks to have fixed the multiple definition issues already. -# This should be removed during the next release -%define _legacy_common_support 1 - #global commit0 53a5c930a4b5b053ab06a8b975458fc51cf41f6c #global shortcommit0 #(c=#{commit0}; echo ${c:0:7}) Name: audacity -Version: 2.3.3 -Release: 8%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: http://audacity.sourceforge.net -%define realname audacity - Source0: http://www.fosshub.com/Audacity.html/%{name}-minsrc-%{version}.tar.xz # For alpha git snapshots for testing use the github archive as upstream source: #Source0: https://github.com/audacity/#{name}/archive/#{commit0}/#{name}-#{commit0}.tar.gz @@ -36,22 +24,8 @@ Source0: http://www.fosshub.com/Audacity.html/%{name}-minsrc-%{version}.tar.xz Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip -Patch1: audacity-2.2.1-libmp3lame-default.patch -Patch2: audacity-2.3.3-libdir.patch -# add audio/x-flac (bug #557335) -# remove audio/mpeg, audio/x-mp3 -# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature -# Add GDK_BACKEND=x11 to exec line (bug #1798987) -Patch3: audacity-2.3.3-desktop.in.patch - -# Fix launchable type in the appdata file (BZ #1810509) -# This has been fixed by upstream in version 2.4.2 -Patch4: audacity-2.3.3-appdata.patch - -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: cmake BuildRequires: gettext-devel -BuildRequires: make %if 0%{?rhel} == 7 BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel @@ -59,12 +33,11 @@ BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils BuildRequires: expat-devel BuildRequires: flac-devel -BuildRequires: gettext +BuildRequires: git BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel BuildRequires: lame-devel @@ -101,13 +74,9 @@ BuildRequires: libappstream-glib %if %{with ffmpeg} %if ! %{with local_ffmpeg} -%if %{with compat_ffmpeg} -BuildRequires: compat-ffmpeg28-devel -%else BuildRequires: ffmpeg-devel %endif %endif -%endif # For new symbols in portaudio Requires: portaudio%{?_isa} >= 19-16 @@ -134,99 +103,64 @@ For the most up to date manual content, use the on-line manual. %prep %setup -q -n %{tartopdir} -# Substitute hardcoded library paths. -%patch1 -p1 -b .libmp3lame-default -%patch2 -p1 -b .libdir -grep -s __RPM_LIB * -R && exit 1 - -# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". -for i in locale/*.po -do - sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i -done -grep -q -s libmp3lame.so\| * -R && exit 1 - -%patch3 -b .desktop -%patch4 -b .appdata - - %build -%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 - -%configure \ - --disable-dynamic-loading \ - --with-help \ -%if (0%{?fedora} && 0%{?fedora} < 28) - --with-wx-version=3.0-gtk2 \ +%if (0%{?fedora} && 0%{?fedora} < 33) +mkdir build +cd build +%cmake \ + .. \ +%else +%cmake \ %endif - --with-libsndfile=system \ - --with-libsoxr=system \ - --without-libresample \ - --without-libsamplerate \ - --with-lame=system \ - --with-libmad=system \ + -Daudacity_use_sndfile=system \ + -Daudacity_use_soxr=system \ + -Daudacity_use_lame=system \ %if 0%{?rhel} == 8 - --without-libtwolame \ + -Daudacity_use_twolame=off \ %else - --with-libtwolame=system \ + -Daudacity_use_twolame=system \ %endif - --with-libflac=system \ - --with-ladspa \ - --with-vorbis=system \ - --with-libid3tag=system \ - --with-expat=system \ - --with-soundtouch=system \ - --with-libvamp=system \ - --with-lv2 \ - --with-portaudio=local \ - --with-midi \ - --with-portmidi \ + -Daudacity_use_flac=system \ + -Daudacity_use_ladspa=on \ + -Daudacity_use_vorbis=system \ + -Daudacity_use_id3tag=system \ + -Daudacity_use_expat=system \ + -Daudacity_use_soundtouch=system \ + -Daudacity_use_vamp=system \ + -Daudacity_use_lv2=local \ + -Daudacity_use_portaudio=local \ + -Daudacity_use_midi=local \ %if %{with ffmpeg} %if ! %{with local_ffmpeg} - --with-ffmpeg=system \ -%endif -%else - --without-ffmpeg \ + -Daudacity_use_ffmpeg=loaded \ %endif -%ifnarch %{ix86} x86_64 - --disable-sse \ %else - %{nil} + -Daudacity_use_fmmpeg=off \ %endif -# 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 +%cmake_build -# 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 %{!?with_local_ffmpeg:ffmpeg} lame libsndfile libsoxr libvamp twolame; do - rm -r lib-src/$i -done -# _smp_mflags cause problems -%make_build +%install +%if (0%{?fedora} && 0%{?fedora} < 33) +cd build +%endif +%cmake_install -%install -%make_install -rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/include +%if (0%{?fedora} && 0%{?fedora} < 33) +cd - +%endif + +rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{name}/include %if 0%{?rhel} >= 8 || 0%{?fedora} if appstream-util --help | grep -q replace-screenshots ; then @@ -241,46 +175,53 @@ appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/audacity.a fi %endif -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{realname}/help/manual +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual # audacity manual must be unzipped to correct location -unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}/help +unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{name}/help -%{find_lang} %{realname} +%{find_lang} %{name} desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora --delete-original \ -%endif $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop -mkdir %{buildroot}%{_datadir}/doc/%{realname}/nyquist -cp -pr lib-src/libnyquist/nyquist/license.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist -cp -pr lib-src/libnyquist/nyquist/Readme.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist -rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt - -%files -f %{realname}.lang -%{_bindir}/%{realname} -%dir %{_datadir}/%{realname} -%{_datadir}/%{realname}/EQDefaultCurves.xml -%{_datadir}/%{realname}/nyquist/ -%{_datadir}/%{realname}/plug-ins/ +mkdir %{buildroot}%{_datadir}/doc/%{name}/nyquist +cp -pr lib-src/libnyquist/nyquist/license.txt %{buildroot}%{_datadir}/doc/%{name}/nyquist +cp -pr lib-src/libnyquist/nyquist/Readme.txt %{buildroot}%{_datadir}/doc/%{name}/nyquist +rm %{buildroot}%{_datadir}/doc/%{name}/LICENSE.txt + +%files -f %{name}.lang +%{_bindir}/%{name} +%{_libdir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/EQDefaultCurves.xml +%{_datadir}/%{name}/modules/ +%{_datadir}/%{name}/nyquist/ +%{_datadir}/%{name}/plug-ins/ +%exclude %{_datadir}/%{name}/help %{_mandir}/man*/* %{_datadir}/applications/* -%{_datadir}/appdata/%{realname}.appdata.xml +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/pixmaps/* -%{_datadir}/icons/hicolor/*/apps/%{realname}.* +%{_datadir}/icons/hicolor/*/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/mime/packages/* -%{_datadir}/doc/%{realname} +%{_datadir}/doc/%{name} %license LICENSE.txt %files manual -%{_datadir}/%{realname}/help/manual/ +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/help +%{_datadir}/%{name}/help/manual/ %changelog -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Sat Jan 2 2021 Brandon Nielsen - 2.4.2-1 +- Cleanup unsupported Fedora version conditionals +- Update to 2.4.2 / cmake +- Make manual own its own folder +- Get rid of realname definition +- Reviewed, tested, committed, and built by Gwyn Ciesla, gwync@protonmail.com * Mon Jul 27 2020 Fedora Release Engineering - 2.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 15ee7e0..107e35b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (audacity-minsrc-2.3.3.tar.xz) = 4be5f766e9d68d71e83bb1c972dc0390da3736228a5d4af514913aec103a0b4bc9858e77b0377681ae9137ab92596bcedc93221a71c32876e4838d00d5681806 -SHA512 (audacity-manual-2.3.3.zip) = 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4 +SHA512 (audacity-minsrc-2.4.2.tar.xz) = 0fcbb2d9e131b3d683b3f0b0d16f565f034d46e57dab1749c52fc8e72f2bc8c64606fd749ed13d925aecef31f38258ad8b79f8e1baa23c99c7b805686e5445b4 +SHA512 (audacity-manual-2.4.2.zip) = 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c