audacity: 2.4.1 -> 2.4.2

4 files changed, 64 insertions, 48 deletions

diff --git a/audacity/.footprint b/audacity/.footprint
index 471ba33ae..e187fec8e 100644
--- a/audacity/.footprint
+++ b/audacity/.footprint
@@ -8,16 +8,8 @@ drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/audacity.desktop
 drwxr-xr-x	root/root	usr/share/audacity/
 -rw-r--r--	root/root	usr/share/audacity/EQDefaultCurves.xml
-drwxr-xr-x	root/root	usr/share/audacity/include/
-drwxr-xr-x	root/root	usr/share/audacity/include/audacity/
--rw-r--r--	root/root	usr/share/audacity/include/audacity/ComponentInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/ConfigInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/EffectAutomationParameters.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/EffectInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/ImporterInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/ModuleInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/PluginInterface.h
--rw-r--r--	root/root	usr/share/audacity/include/audacity/Types.h
+drwxr-xr-x	root/root	usr/share/audacity/modules/
+-rw-r--r--	root/root	usr/share/audacity/modules/mod-script-pipe.so
 drwxr-xr-x	root/root	usr/share/audacity/nyquist/
 -rw-r--r--	root/root	usr/share/audacity/nyquist/aud-do-support.lsp
 -rw-r--r--	root/root	usr/share/audacity/nyquist/dspprims.lsp
@@ -34,6 +26,22 @@ drwxr-xr-x	root/root	usr/share/audacity/nyquist/
 -rw-r--r--	root/root	usr/share/audacity/nyquist/nyquist.lsp
 -rw-r--r--	root/root	usr/share/audacity/nyquist/printrec.lsp
 -rw-r--r--	root/root	usr/share/audacity/nyquist/profile.lsp
+drwxr-xr-x	root/root	usr/share/audacity/nyquist/rawwaves/
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand1.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand10.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand11.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand12.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand2.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand3.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand4.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand5.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand6.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand7.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand8.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mand9.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/mandpluk.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/marmstk1.raw
+-rw-r--r--	root/root	usr/share/audacity/nyquist/rawwaves/sinewave.raw
 -rw-r--r--	root/root	usr/share/audacity/nyquist/sal-parse.lsp
 -rw-r--r--	root/root	usr/share/audacity/nyquist/sal.lsp
 -rw-r--r--	root/root	usr/share/audacity/nyquist/seq.lsp
@@ -83,20 +91,15 @@ drwxr-xr-x	root/root	usr/share/audacity/plug-ins/
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/audacity.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/audacity.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/audacity.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/audacity.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/audacity.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/24x24/audacity.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/audacity.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/audacity.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/audacity.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/audacity.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/audacity.svg
diff --git a/audacity/.signature b/audacity/.signature
index db735e302..0bc2435e0 100644
--- a/audacity/.signature
+++ b/audacity/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31DCLhh8TaVQL36bRfNiYeFA78FRweXs3Vuxe1biJFkPtU0/FZTImWW7IkA85cezjcC0b4nY9pN1bdqhk/XtYwo=
-SHA256 (Pkgfile) = 920b63c078b422af54d0b859bdc315c843b42d78e6f562b110741d3dc2293b7f
-SHA256 (.footprint) = bf451909975b355e53127d025885865039c78b17d1643ec676a7907f7ffcc9db
-SHA256 (Audacity-2.4.1.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+RWSagIOpLGJF3yR/fWTtKfNnkWD6cLgYvbYHdeoCH3DwaV+o8gDWNvcYQ86Dq96sLR+04okv35FYLzce0qzHWwytbNHrE2JZiAg=
+SHA256 (Pkgfile) = 70bc410048a6e076f9ce7e3263428a26e1c45daae1d353badd5118aeb40fd465
+SHA256 (.footprint) = 24e65bf69a344429e27f38b3f8175bf2f60c99e7b62bdab34a05d07bb3e72bd0
+SHA256 (Audacity-2.4.2.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
+SHA256 (lame.pc) = cfb5ec8878759dc1076f667553bdd7176023b026fe6aaf102ac11717c39433bf
diff --git a/audacity/Pkgfile b/audacity/Pkgfile
index f426d1a2c..fa589049c 100644
--- a/audacity/Pkgfile
+++ b/audacity/Pkgfile
@@ -1,36 +1,38 @@
 # Description: Audio recording and editing program
 # URL: https://www.audacityteam.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: jack-audio-connection-kit lame libid3tag libmad libsoxr lilv soundtouch suil twolame vamp-plugin-sdk wxgtk3
+# Depends on: jack-audio-connection-kit libid3tag libmad libsoxr lilv soundtouch suil twolame vamp-plugin-sdk wxgtk3
 # Optional: portsmf
 
 name=audacity
-version=2.4.1
+version=2.4.2
 release=1
-source=(https://github.com/$name/$name/archive/Audacity-$version.tar.gz)
+source=(https://github.com/$name/$name/archive/Audacity-$version.tar.gz
+	lame.pc)
 
 build() {
-	cd $name-Audacity-$version
-
-	CONFIG_SHELL=/bin/bash \
-	WX_CONFIG=wx-config-gtk3 \
-	./configure \
-		--prefix=/usr \
-		--with-libsndfile="system" \
-		--with-ffmpeg="system" \
-		--with-expat="system" \
-		--with-lame="system" \
-		--with-libsoxr="system" \
-		--with-libflac \
-		--with-libsamplerate \
-		--with-lv2 \
-		--disable-dynamic-loading
-
-	make
-	make DESTDIR=$PKG install
-
-	install -vDm 644 plug-ins/*.ny -t $PKG/usr/share/$name/plug-ins
-	install -vDm 644 nyquist/*.lsp -t $PKG/usr/share/$name/nyquist
+	# included in src/AboutDialog.cpp but not supplied in source tarball
+	touch $name-Audacity-$version/include/RevisionIdent.h
+
+	# cmake can't find libmp3lame without a .pc file
+	cp $SRC/lame.pc $name-Audacity-$version/lame.pc
+
+	export WX_CONFIG=wx-config-gtk3
+	export PKG_CONFIG_PATH="$PWD:$PKG_CONFIG_PATH"
+
+	[ -e '/usr/bin/ccache' ] && PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
+
+	cmake -S$name-Audacity-$version -Bbuild -GNinja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=Release
+
+	cmake --build build
+	DESTDIR=$PKG cmake --build build --target install
+
+#	install -vDm 644 plug-ins/*.ny -t $PKG/usr/share/$name/plug-ins
+#	install -vDm 644 nyquist/*.lsp -t $PKG/usr/share/$name/nyquist
 
 	rm -r $PKG/usr/share/{doc,locale}
 }
diff --git a/audacity/lame.pc b/audacity/lame.pc
new file mode 100644
index 000000000..549fac54e
--- /dev/null
+++ b/audacity/lame.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mp3lame
+Description: encoder that converts audio to the MP3 file format
+Version: 3.100
+Requires: 
+Libs: -L${libdir} -lmp3lame
+Cflags: -I${includedir}