commit 1d790429db0251c7d476c11e545a6b2b54911055
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon Sep 25 20:24:48 2023 +0200
- up to 3.3.3
audacity-desktop.patch | 18 --------
audacity-no-macos.patch | 13 ------
audacity-opt.patch | 24 -----------
audacity.spec | 106 +++++++++++++++++++++++-----------------------
msgstr-format.patch | 22 ++++++++++
use-system-libsbsms.patch | 21 ---------
6 files changed, 74 insertions(+), 130 deletions(-)
---
diff --git a/audacity.spec b/audacity.spec
index 47461d6..738411e 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -25,19 +25,15 @@ Summary: Audacity - manipulate digital audio waveforms
Summary(pl.UTF-8): Audacity - narzędzie do obróbki plików dźwiękowych
Summary(ru.UTF-8): Кроссплатформенный звуковой редактор
Name: audacity
-Version: 2.4.2
-Release: 3
+Version: 3.3.3
+Release: 1
License: GPL v2+
Group: X11/Applications/Sound
-#Source0Download: http://www.fosshub.com/Audacity.html
-Source0: %{name}-minsrc-%{version}.tar.xz
-# Source0-md5: 4a34c1c66f69f1fedc400c71d5155ea8
-Source1: %{name}-manual-%{version}.zip
-# Source1-md5: 084830de81c157d229089338a594baab
-Patch0: %{name}-opt.patch
-Patch1: %{name}-no-macos.patch
-Patch2: %{name}-desktop.patch
-Patch3: use-system-libsbsms.patch
+Source0:
https://github.com/audacity/audacity/releases/download/Audacity-%{version}/%{name}-sources-%{version}.tar.gz
+# Source0-md5: c69f2091ef0b65022e19ccce62379ff2
+Source1:
https://github.com/audacity/audacity-manual/releases/download/v%{version}/%{name}-manual-%{version}.tar.gz
+# Source1-md5: cd0ad05077976c51889a13081910462e
+Patch0: msgstr-format.patch
URL: http://audacityteam.org/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.59
@@ -51,7 +47,6 @@ BuildRequires: gettext-tools >= 0.18
%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0}
BuildRequires: hpklinux-devel >= 4.06
BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: lame-libs-devel
BuildRequires: libid3tag-devel >= 0.15.0b-2
BuildRequires: libjpeg-devel
BuildRequires: libmad-devel >= 0.14.2b-4
@@ -76,13 +71,11 @@ BuildRequires: udev-devel
BuildRequires: unzip
BuildRequires: vamp-devel >= 2.0
BuildRequires: which
-%{!?with_gtk3:BuildRequires: wxGTK2-unicode-devel >= 3.0.0}
-%{?with_gtk3:BuildRequires: wxGTK3-unicode-devel >= 3.0.0}
+BuildRequires: wxGTK2-unicode-devel >= 3.1.3
BuildRequires: xz
Requires(post,postun): shared-mime-info
Requires: flac-c++ >= 1.3.0
# dlopened
-Requires: lame-libs
Requires: libid3tag >= 0.15.0b-2
Requires: libmad >= 0.14.2b-4
Requires: libsbsms2 >= 2.1.0
@@ -116,49 +109,51 @@ Audacity - это звуковой редактор, позволяющий ра
плагинов, к любой части звукового файла.
%prep
-%setup -q -n %{name}-minsrc-%{version}
+%setup -q -n %{name}-sources-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-%{__sed} -i 's/libmp3lame.so/libmp3lame.so.0/g' locale/*.po
# Make sure we use the system versions.
-%{__rm} -rf
lib-src/{expat,ffmpeg,libflac,libid3tag,lame,lv2,libmad,libogg,libsndfile,soundtouch,libsoxr,twolame,libvamp,libvorbis,sbsms}/
-
-# Audacity's cmake can't find libmp3lame without a .pc file
-# This is a temporary workaround.
-if ! test -e %{_pkgconfigdir}/lame.pc
-then
-echo "creating lame.pc"
-cat << EOF > lame.pc
-prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}/lame
-
-Name: mp3lame
-Description: encoder that converts audio to the MP3 file format.
-Version: 3.100
-Libs: -L${libdir} -lmp3lame
-Cflags: -I${includedir}
-EOF
-fi
+%{__rm} -r lib-src/{lv2,soundtouch,libsoxr,twolame,libvamp}/
%build
-if ! test -e %{_pkgconfigdir}/lame.pc
-then
-export PKG_CONFIG_PATH="`echo $PWD`:%{_pkgconfigdir}"
-fi
-
mkdir -p build
cd build
%cmake .. \
%{cmake_on_off mmx HAVE_MMX} \
%{cmake_on_off sse HAVE_SSE} \
%{cmake_on_off sse2 HAVE_SSE2} \
+ -Daudacity_conan_enabled=OFF \
+ -Daudacity_has_crashreports=OFF \
+ -Daudacity_has_updates_check=OFF \
+ -Daudacity_has_sentry_reporting=OFF \
+ -Daudacity_has_networking=OFF \
+ -Daudacity_has_vst3=OFF \
+ -Daudacity_lib_preference=system \
+ -Daudacity_obey_system_dependencies=ON \
+ -Daudacity_use_wxwidgets=system \
+ -Daudacity_use_sqlite=system \
+ -Daudacity_use_libsndfile=system \
+ -Daudacity_use_soxr=system \
+ -Daudacity_use_lame=system \
+ -Daudacity_use_twolame=system \
+ -Daudacity_use_libflac=system \
+ -Daudacity_use_ladspa=on \
+ -Daudacity_use_libvorbis=system \
+ -Daudacity_use_libid3tag=system \
+ -Daudacity_use_expat=system \
+ -Daudacity_use_soundtouch=system \
+ -Daudacity_use_vamp=system \
+ -Daudacity_use_lv2=system \
+ -Daudacity_use_portaudio=system \
+ -Daudacity_use_midi=system \
+ -Daudacity_use_libogg=system \
+ -Daudacity_use_portsmf=local \
-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH=$(which
wx-gtk%{?with_gtk3:3}%{!?with_gtk3:2}-unicode-config) \
- %{!?with_ffmpeg:-Daudacity_use_ffmpeg:STRING=off}
+%if %{with ffmpeg}
+ -Daudacity_use_ffmpeg=loaded
+%else
+ -Daudacity_use_ffmpeg=off
+%endif
%{__make}
@@ -171,7 +166,8 @@ cd build
INSTALL_PATH=$RPM_BUILD_ROOT
cd ..
-%{__unzip} -qq -a %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{name}/help
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/help
+%{__tar} xf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/%{name}/help
# unify locale names
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES@valencia,ca@valencia}
@@ -187,7 +183,7 @@ cd ..
%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/audacity32.xpm
%{__rm}
$RPM_BUILD_ROOT%{_pixmapsdir}/gnome-mime-application-x-audacity-project.xpm
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/README.txt
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/README.md
%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE.txt
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -212,17 +208,19 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README.txt LICENSE.txt
+%doc README.md LICENSE.txt
%attr(755,root,root) %{_bindir}/audacity
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/lib-*.so
+%dir %{_libdir}/%{name}/modules
+%attr(755,root,root) %{_libdir}/%{name}/modules/mod-script-pipe.so
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/modules
-%attr(755,root,root) %{_datadir}/%{name}/modules/mod-script-pipe.so
+%{_datadir}/%{name}/help
%{_datadir}/%{name}/nyquist
%{_datadir}/%{name}/plug-ins
-%{_datadir}/%{name}/EQDefaultCurves.xml
-%doc %{_datadir}/%{name}/help
+%{_datadir}/%{name}/EffectsMenuDefaults.xml
%{_mandir}/man1/audacity.1*
%{_desktopdir}/audacity.desktop
-%{_datadir}/appdata/audacity.appdata.xml
+%{_metainfodir}/audacity.appdata.xml
%{_datadir}/mime/packages/audacity.xml
%{_iconsdir}/hicolor/*/apps/*.*
diff --git a/audacity-desktop.patch b/audacity-desktop.patch
deleted file mode 100644
index d439cfa..0000000
--- a/audacity-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- audacity-minsrc-2.4.2/src/audacity.desktop.in.old 2019-10-21
20:29:41.000000000 +0000
-+++ audacity-minsrc-2.4.2/src/audacity.desktop.in 2021-01-18
11:58:08.159386601 +0000
-@@ -12,6 +12,7 @@
- GenericName[ko]=오디오 편집기
- GenericName[lt]=Garsų rengyklė
- GenericName[nl]=Geluidseditor
-+GenericName[pl]=Edytor plików dźwiękowych
- GenericName[pt_BR]=Editor de áudio
- GenericName[pt_PT]=Editor de áudio
- GenericName[ru]=Редактор звуковых файлов
-@@ -32,6 +33,7 @@
- Comment[kr]=오디오 파일 녹음과 편집
- Comment[lt]=Įrašyti ir montuoti garso failus
- Comment[nl]=Audiobestanden opnemen en bewerken
-+Comment[pl]=Edytor plików dźwiękowych
- Comment[pt_BR]=Gravar e editar arquivos de áudio
- Comment[pt_PT]=Gravar e editar ficheiros de áudio
- Comment[ru]=Запись и редактирование звуковых файлов
diff --git a/audacity-no-macos.patch b/audacity-no-macos.patch
deleted file mode 100644
index 3e856be..0000000
--- a/audacity-no-macos.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- audacity-minsrc-2.4.2/lib-src/portaudio-v19/include/pa_mac_core.h.old
2018-08-28 10:48:03.000000000 +0000
-+++ audacity-minsrc-2.4.2/lib-src/portaudio-v19/include/pa_mac_core.h
2021-01-18 00:32:30.022599655 +0000
-@@ -45,8 +45,8 @@
-
- #include "portaudio.h"
-
--#include <AudioUnit/AudioUnit.h>
--#include <AudioToolbox/AudioToolbox.h>
-+//#include <AudioUnit/AudioUnit.h>
-+//#include <AudioToolbox/AudioToolbox.h>
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/audacity-opt.patch b/audacity-opt.patch
deleted file mode 100644
index c8b5ded..0000000
--- a/audacity-opt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac.orig
2006-10-29 01:05:51.000000000 +0200
-+++ audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac 2006-12-29
20:12:30.975109012 +0100
-@@ -31,6 +31,10 @@
- [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)],
- [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
-
-+if test -n "$CFLAGS" ; then
-+ cflags="$CFLAGS"
-+fi
-+
- PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19])
-
- #
---- a/lib-src/portsmf/configure.ac~ 2008-10-25 14:14:23.000000000 +0200
-+++ a/lib-src/portsmf/configure.ac 2009-05-26 14:57:39.406323603 +0200
-@@ -25,7 +25,7 @@
- # which also contains a subdir containing macros
- AC_CONFIG_MACRO_DIR([autotools/m4])
- dnl set up automake
--AM_INIT_AUTOMAKE([-Wall foreign])
-+AM_INIT_AUTOMAKE
- dnl Audacity policy: don't enable automatic rebuild of configure et al if
- dnl sources change
- AM_MAINTAINER_MODE
diff --git a/msgstr-format.patch b/msgstr-format.patch
new file mode 100644
index 0000000..2ed4575
--- /dev/null
+++ b/msgstr-format.patch
@@ -0,0 +1,22 @@
+--- audacity-sources-3.3.3/locale/be.po~ 2023-09-25 19:43:04.000000000
+0200
++++ audacity-sources-3.3.3/locale/be.po 2023-09-25 19:53:26.371027373
+0200
+@@ -4469,7 +4469,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Памылка (магчыма, файл не запісаны): %hs"
++msgstr "Памылка (магчыма, файл не запісаны): %s"
+
+ #: src/FileFormats.cpp
+ #, fuzzy
+--- audacity-sources-3.3.3/locale/fa.po~ 2023-09-25 19:43:04.000000000
+0200
++++ audacity-sources-3.3.3/locale/fa.po 2023-09-25 19:54:02.091050711
+0200
+@@ -4413,7 +4413,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
++msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
+
+ #: src/FileFormats.cpp
+ msgid "&Copy uncompressed files into the project (safer)"
diff --git a/use-system-libsbsms.patch b/use-system-libsbsms.patch
deleted file mode 100644
index 9dc3059..0000000
--- a/use-system-libsbsms.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- audacity-minsrc-2.4.2/cmake-proxies/CMakeLists.txt~ 2020-05-30
11:55:53.000000000 +0000
-+++ audacity-minsrc-2.4.2/cmake-proxies/CMakeLists.txt 2021-01-25
15:40:30.370255530 +0000
-@@ -149,7 +149,7 @@
- addlib( portmidi midi MIDI NO YES "portmidi >=
0.1" )
- addlib( portmixer portmixer PORTMIXER NO YES "" )
- addlib( portsmf portsmf PORTSMF NO YES "portSMF >=
0.1" )
--addlib( sbsms sbsms SBSMS NO YES "" )
-+addlib( sbsms sbsms SBSMS NO YES "sbsms" )
- addlib( soundtouch soundtouch SOUNDTOUCH NO YES "soundtouch >=
1.7.1" )
- addlib( twolame twolame LIBTWOLAME NO YES "twolame >=
0.3.13" )
-
---- audacity-minsrc-2.4.2/lib-src/header-substitutes/sbsms.h~ 2018-08-28
10:48:03.000000000 +0000
-+++ audacity-minsrc-2.4.2/lib-src/header-substitutes/sbsms.h 2021-01-25
16:18:05.627283474 +0000
-@@ -11,6 +11,6 @@
-
- #else //_MSC_VER
-
--#include "../sbsms/include/sbsms.h"
-+#include "/usr/include/sbsms.h"
-
- #endif //_MSC_VER
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/audacity.git/commitdiff/1d790429db0251c7d476c11e545a6b2b54911055
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
