audacity-cmake: Update to 2.4.2

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Mon Jun 29 18:51:55 2020 +0100
Changeset:	d346dd0bae8138777190c40b10ef8cdfdc277f45

Modified Files:
	audacity-cmake/Makefile
	audacity-cmake/PLIST
	audacity-cmake/distinfo
	audacity-cmake/patches/patch-cmake-proxies_CMakeLists.txt
Added Files:
	audacity-cmake/patches/patch-lib-src_header-substitutes_allegro.h
Removed Files:
	audacity-cmake/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c

Log Message:
audacity-cmake: Update to 2.4.2

Still doesn't work. cmake is now the only build system...

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d346dd0bae8138777190c40b10ef8cdfdc277f45

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 audacity-cmake/Makefile                             |  7 ++++---
 audacity-cmake/PLIST                                |  1 +
 audacity-cmake/distinfo                             | 12 ++++++------
 .../patches/patch-cmake-proxies_CMakeLists.txt      |  6 +++---
 .../patch-lib-src_header-substitutes_allegro.h      | 21 +++++++++++++++++++++
 ...atch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c | 15 ---------------
 6 files changed, 35 insertions(+), 27 deletions(-)

diffs:
diff --git a/audacity-cmake/Makefile b/audacity-cmake/Makefile
index f1751f35d3..5580cd8016 100644
--- a/audacity-cmake/Makefile
+++ b/audacity-cmake/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.132 2020/04/16 21:54:06 nia Exp $
 
-DISTNAME=	audacity-2.4.1
+DISTNAME=	audacity-2.4.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=audacity/}
 GITHUB_PROJECT=	Audacity
@@ -23,14 +23,15 @@ GCC_REQD+=	4.9
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE="Debug"
+#CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE="Debug"
+
+CMAKE_ARGS+=	-DPYTHON=${PYTHONBIN}
 
 CMAKE_ARGS+=	-Daudacity_use_expat=system
 CMAKE_ARGS+=	-Daudacity_use_ffmpeg=linked
 CMAKE_ARGS+=	-Daudacity_use_flac=system
 CMAKE_ARGS+=	-Daudacity_use_id3tag=system
 CMAKE_ARGS+=	-Daudacity_use_lame=system
-CMAKE_ARGS+=	-Daudacity_use_libextra=local
 CMAKE_ARGS+=	-Daudacity_use_lv2=system
 CMAKE_ARGS+=	-Daudacity_use_mad=off
 CMAKE_ARGS+=	-Daudacity_use_midi=local
diff --git a/audacity-cmake/PLIST b/audacity-cmake/PLIST
index 110499b10b..8dbf9e135c 100644
--- a/audacity-cmake/PLIST
+++ b/audacity-cmake/PLIST
@@ -4,6 +4,7 @@ man/man1/audacity.1
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 share/audacity/EQDefaultCurves.xml
+share/audacity/modules/mod-script-pipe.so
 share/audacity/nyquist/aud-do-support.lsp
 share/audacity/nyquist/dspprims.lsp
 share/audacity/nyquist/envelopes.lsp
diff --git a/audacity-cmake/distinfo b/audacity-cmake/distinfo
index 2cf5856c86..28b0cfd1f9 100644
--- a/audacity-cmake/distinfo
+++ b/audacity-cmake/distinfo
@@ -1,16 +1,16 @@
 $NetBSD: distinfo,v 1.42 2020/04/16 21:54:06 nia Exp $
 
-SHA1 (audacity-2.4.1.tar.gz) = f164b6a2e02947809cee2e313cb61279a60d4829
-RMD160 (audacity-2.4.1.tar.gz) = 8c0b5643d015c7dd5bbe1b47eae0025201eb51b2
-SHA512 (audacity-2.4.1.tar.gz) = 2f0a3f7e24dce91ae520e285dbb05778b68e0fe37b8ded55ac568b5f8135069951b3986764adc5d0791c165b283a3c19596f1d6f51ba17028e0eb04558c63f25
-Size (audacity-2.4.1.tar.gz) = 63935461 bytes
+SHA1 (audacity-2.4.2.tar.gz) = 689451349c7d7dc34a1927498b23ada96390e82c
+RMD160 (audacity-2.4.2.tar.gz) = fae613ada7ffbcf17ff3b2794e0c9ce785caa00b
+SHA512 (audacity-2.4.2.tar.gz) = 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
+Size (audacity-2.4.2.tar.gz) = 61248430 bytes
 SHA1 (patch-CMakeLists.txt) = 633bd63588271947d3992397f6106d2568bedf24
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
-SHA1 (patch-cmake-proxies_CMakeLists.txt) = 468fb2e8812c86f1a681bdd7bb70c5575af14bfa
+SHA1 (patch-cmake-proxies_CMakeLists.txt) = ef405775e6b033a89f935971b2a73026a29767d2
 SHA1 (patch-cmake-proxies_portaudio-v19_CMakeLists.txt) = 6ab7d63fc7ae0a37dbce77887b0f8a1d24f3d059
 SHA1 (patch-cmake-proxies_portmidi_CMakeLists.txt) = 661dd5714908299fea9b8612a762e57bba613472
+SHA1 (patch-lib-src_header-substitutes_allegro.h) = e25aa6f348eb52f500099ce829347b7601ba13be
 SHA1 (patch-lib-src_libnyquist_nyquist_cmupv_src_cmupv.c) = 3d6cb845d82b1bcbe31dabd4bad30cb1f7ea27d5
-SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
 SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
diff --git a/audacity-cmake/patches/patch-cmake-proxies_CMakeLists.txt b/audacity-cmake/patches/patch-cmake-proxies_CMakeLists.txt
index 8d4c84d0bd..b1e40532bf 100644
--- a/audacity-cmake/patches/patch-cmake-proxies_CMakeLists.txt
+++ b/audacity-cmake/patches/patch-cmake-proxies_CMakeLists.txt
@@ -2,10 +2,10 @@ $NetBSD$
 
 Detect pkgsrc portaudio using pkg-config.
 
---- cmake-proxies/CMakeLists.txt.orig	2020-05-19 09:43:53.000000000 +0000
+--- cmake-proxies/CMakeLists.txt.orig	2020-06-19 15:16:47.000000000 +0000
 +++ cmake-proxies/CMakeLists.txt
-@@ -150,7 +150,7 @@ addlib( lame               lame        L
- addlib( lib-widget-extra   libextra    EXTRA       YES   YES   "" )
+@@ -132,7 +132,7 @@ addlib( expat              expat       E
+ addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
  addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
  addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
 -addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
diff --git a/audacity-cmake/patches/patch-lib-src_header-substitutes_allegro.h b/audacity-cmake/patches/patch-lib-src_header-substitutes_allegro.h
new file mode 100644
index 0000000000..9cf5681505
--- /dev/null
+++ b/audacity-cmake/patches/patch-lib-src_header-substitutes_allegro.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+More than just linux has memcpy in <cstring>...
+
+--- lib-src/header-substitutes/allegro.h.orig	2020-06-19 15:16:47.000000000 +0000
++++ lib-src/header-substitutes/allegro.h
+@@ -10,13 +10,9 @@
+ #include "../portsmf/allegro.h"
+ #pragma warning( pop )
+ 
+-#elif defined(__linux__)
+-
+-#include <cstring> // Allegro include fails if this header isn't included due to no memcpy
+-#include "../portsmf/allegro.h"
+-
+ #else //_MSC_VER
+ 
++#include <cstring> // Allegro include fails if this header isn't included due to no memcpy
+ #include "../portsmf/allegro.h"
+ 
+ #endif //_MSC_VER
diff --git a/audacity-cmake/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c b/audacity-cmake/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c
deleted file mode 100644
index 3af6c083b8..0000000000
--- a/audacity-cmake/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c,v 1.2 2016/06/05 01:02:39 ryoon Exp $
-
-Fixes "error: invalid operands to binary" build failure.
-
---- lib-src/libnyquist/nyquist/nyqsrc/sndread.c.orig	2016-01-13 14:31:18.000000000 +0000
-+++ lib-src/libnyquist/nyquist/nyqsrc/sndread.c
-@@ -167,7 +167,7 @@ LVAL snd_make_read(
- #ifdef XL_BIG_ENDIAN
-         long format = SF_ENDIAN_LITTLE;
- #endif
--        susp->sf_info.format |= format;
-+        susp->sf_info.format |= (int) format;
-     }
- 
-     susp->sndfile = NULL;