audio/audacity: Update to 2.3.0

PR:		231837
Submitted by:	xxjack12xx@gmail.com (maintainer)

13 files changed, 55 insertions, 49 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 45cc3c3b75dd..1cc3672754f0 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	Audacity-
-PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	xxjack12xx@gmail.com
@@ -40,7 +39,7 @@ SHEBANG_FILES=	lib-src/lv2/build
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
-		MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
+		MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
 OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
 			SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
 
@@ -53,6 +52,8 @@ DYNLOAD_DESC=	Enable dynamic loading of lame and FFmpeg
 LAME_DESC=	Use lame for import and export support
 LV2_DESC=	Add LV2 plug-in support
 MAD_DESC=	Use libmad for mp2/3 decoding support
+MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
+MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
 SBSMS_DESC=	Use libsbsms for pitch and tempo changing
 SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
 TAGLIB_DESC=	Use TagLib for metadata support
@@ -101,9 +102,6 @@ JACK_LIB_DEPENDS=	libjack.so:audio/jack
 LADSPA_CONFIGURE_ENABLE=	ladspa
 LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa
 
-MAD_CONFIGURE_WITH=	libmad=system
-MAD_LIB_DEPENDS=	libmad.so:audio/libmad
-
 LAME_CONFIGURE_ON=	--with-lame=system
 LAME_CONFIGURE_OFF=	--with-lame	# --without-lame is broken
 LAME_CPPFLAGS=		-I${LOCALBASE}/include
@@ -114,6 +112,14 @@ LV2_CONFIGURE_WITH=	lv2=system
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 			libsuil-0.so:audio/suil
 
+MAD_CONFIGURE_WITH=	libmad=system
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
+
+MOD_SCRIPT_PIPE_CONFIGURE_WITH=	mod-script-pipe
+MOD_SCRIPT_PIPE_USES=	python:3.6+
+MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
+MOD_NYQ_BENCH_USES=	python:3.6+
+
 SBSMS_CONFIGURE_WITH=	sbsms
 
 SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index cc7c881bb38e..e828e68409e1 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519297034
-SHA256 (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3
-SIZE (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 25947462
+TIMESTAMP = 1538360236
+SHA256 (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e
+SIZE (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 27479664
diff --git a/audio/audacity/files/patch-configure.ac b/audio/audacity/files/patch-configure.ac
index 489f79e86e93..536f23a7145e 100644
--- a/audio/audacity/files/patch-configure.ac
+++ b/audio/audacity/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig   2016-01-08 22:05:48 UTC
+--- configure.ac.orig	2018-09-20 14:35:07 UTC
 +++ configure.ac
-@@ -235,20 +235,7 @@
+@@ -235,20 +235,7 @@ dnl check if alloca.h exists. If it does, we need to i
  dnl Solaris builds, by defining HAVE_ALLOCA_H
  AC_CHECK_HEADERS_ONCE(alloca.h)
  
diff --git a/audio/audacity/files/patch-include_audacity_Types.h b/audio/audacity/files/patch-include_audacity_Types.h
index 78d1b1c653b2..316d55e8991c 100644
--- a/audio/audacity/files/patch-include_audacity_Types.h
+++ b/audio/audacity/files/patch-include_audacity_Types.h
@@ -1,6 +1,6 @@
---- include/audacity/Types.h.orig       2017-03-13 21:02:21 UTC
+--- include/audacity/Types.h.orig	2018-10-01 14:07:33 UTC
 +++ include/audacity/Types.h
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@ class sampleCount (public)
     sampleCount ( long v ) : value { v } {}
  
     // unsigned long is 64 bit on some platforms.  Let it narrow.
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
index da4d87cdd8b1..9bebf61dd0e7 100644
--- a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
@@ -1,4 +1,4 @@
---- lib-src/FileDialog/Makefile.am.orig	2016-07-26 13:34:06 UTC
+--- lib-src/FileDialog/Makefile.am.orig	2018-10-01 14:07:33 UTC
 +++ lib-src/FileDialog/Makefile.am
 @@ -1,5 +1,7 @@
  ACLOCAL_AMFLAGS = -I m4
@@ -7,8 +7,8 @@
 +DIST_SUBDIRS=	gtk mac win
  lib_LTLIBRARIES = libFileDialog.la
  
- libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
-@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
+ libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
+@@ -8,22 +10,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
  libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
  
  if GTK
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_configure.ac b/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
index 36aa6958d573..769ad362d06e 100644
--- a/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
+++ b/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
@@ -1,6 +1,6 @@
---- lib-src/FileDialog/configure.ac.orig	2016-01-08 22:05:48 UTC
+--- lib-src/FileDialog/configure.ac.orig	2018-09-20 14:35:07 UTC
 +++ lib-src/FileDialog/configure.ac
-@@ -124,7 +124,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEME
+@@ -124,7 +124,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
  
  echo "Implementation to use: $IMPLEMENTATION"
  
diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
index ff74e0d6f488..035825c57c69 100644
--- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
+++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
@@ -1,6 +1,6 @@
---- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2016-07-26 13:34:07 UTC
+--- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2018-10-01 14:07:33 UTC
 +++ lib-src/libnyquist/nyquist/cmt/cext.h
-@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting
+@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
  #include <malloc.h>
  #endif
  
diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
index 0330f64279e1..6b9914f06e76 100644
--- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
+++ b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
@@ -1,6 +1,6 @@
 --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
 +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -153,6 +153,15 @@ extern long ptrtoabs();
+@@ -160,6 +160,15 @@ extern long ptrtoabs();
  #endif
  #endif
  
diff --git a/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c b/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c
index ed162814bc79..bb9884d5ece7 100644
--- a/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c
+++ b/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c
@@ -1,6 +1,6 @@
---- lib-src/portmidi/porttime/ptlinux.c.orig	2018-02-22 17:57:15.438232000 -0800
-+++ lib-src/portmidi/porttime/ptlinux.c	2018-02-22 19:12:15.820418000 -0800
-@@ -31,14 +31,13 @@
+--- lib-src/portmidi/porttime/ptlinux.c.orig	2018-10-01 14:07:33 UTC
++++ lib-src/portmidi/porttime/ptlinux.c
+@@ -31,14 +31,13 @@ CHANGE LOG
  #include "porttime.h"
  #include "sys/time.h"
  #include "sys/resource.h"
@@ -16,7 +16,7 @@
  static pthread_t pt_thread_pid;
  static int pt_thread_created = FALSE;
  
-@@ -79,7 +78,7 @@
+@@ -79,7 +78,7 @@ static void *Pt_CallbackProc(void *p)
  PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
  {
      if (time_started_flag) return ptNoError;
@@ -25,7 +25,7 @@
      if (callback) {
          int res;
          pt_callback_parameters *parms = (pt_callback_parameters *) 
-@@ -121,10 +120,10 @@
+@@ -121,10 +120,10 @@ int Pt_Started()
  PtTimestamp Pt_Time()
  {
      long seconds, milliseconds;
diff --git a/audio/audacity/files/patch-src_AudioIO.cpp b/audio/audacity/files/patch-src_AudioIO.cpp
index db667d7cf020..1e8378638927 100644
--- a/audio/audacity/files/patch-src_AudioIO.cpp
+++ b/audio/audacity/files/patch-src_AudioIO.cpp
@@ -1,6 +1,6 @@
---- src/AudioIO.cpp.orig	2018-07-17 20:25:01 UTC
+--- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
 +++ src/AudioIO.cpp
-@@ -465,7 +465,6 @@ TimeTrack and AudioIOListener and whether the playback
+@@ -467,7 +467,6 @@ TimeTrack and AudioIOListener and whether the playback
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
     #include "../lib-src/portmidi/pm_common/portmidi.h"
@@ -8,7 +8,7 @@
     #include "NoteTrack.h"
  #endif
  
-@@ -979,13 +978,22 @@ struct AudioIO::ScrubQueue (private)
+@@ -787,13 +786,22 @@ struct AudioIO::ScrubState (private)
  // return the system time as a double
  static double streamStartTime = 0; // bias system time to small number
  
diff --git a/audio/audacity/files/patch-src_FFmpeg.h b/audio/audacity/files/patch-src_FFmpeg.h
index 80856b49ddb2..1b2ecec4f3b5 100644
--- a/audio/audacity/files/patch-src_FFmpeg.h
+++ b/audio/audacity/files/patch-src_FFmpeg.h
@@ -1,6 +1,6 @@
---- src/FFmpeg.h.orig	2016-07-26 13:34:06 UTC
+--- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
 +++ src/FFmpeg.h
-@@ -689,7 +689,7 @@ extern "C" {
+@@ -705,7 +705,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVOutputFormat*,
        av_oformat_next,
@@ -8,8 +8,8 @@
 +      (const AVOutputFormat *f),
        (f)
     );
-    FFMPEG_FUNCTION_WITH_RETURN(
-@@ -756,7 +756,7 @@ extern "C" {
+ #endif
+@@ -786,7 +786,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        int,
        av_fifo_size,
@@ -17,8 +17,8 @@
 +      (const AVFifoBuffer *f),
        (f)
     );
-    FFMPEG_FUNCTION_WITH_RETURN(
-@@ -802,7 +802,7 @@ extern "C" {
+ #endif
+@@ -848,7 +848,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVDictionaryEntry *,
        av_dict_get,
@@ -26,4 +26,4 @@
 +      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
        (m, key, prev, flags)
     );
-    FFMPEG_FUNCTION_WITH_RETURN(
+ #endif
diff --git a/audio/audacity/files/patch-src_Makefile.am b/audio/audacity/files/patch-src_Makefile.am
index 5db97e87aa98..d894d3d4cc78 100644
--- a/audio/audacity/files/patch-src_Makefile.am
+++ b/audio/audacity/files/patch-src_Makefile.am
@@ -1,6 +1,6 @@
 --- src/Makefile.am.orig	2016-07-26 13:34:06 UTC
 +++ src/Makefile.am
-@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \
+@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
  #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
  #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
  #           ^
diff --git a/audio/audacity/files/patch-src_MemoryX.h b/audio/audacity/files/patch-src_MemoryX.h
index 6cda1a9fbb3a..e8c86f8af7be 100644
--- a/audio/audacity/files/patch-src_MemoryX.h
+++ b/audio/audacity/files/patch-src_MemoryX.h
@@ -1,5 +1,5 @@
---- src/MemoryX.h.orig	2018-02-22 14:12:04.240599000 -0800
-+++ src/MemoryX.h	2018-02-22 14:01:53.685861000 -0800
+--- src/MemoryX.h.orig	2018-10-01 14:07:33 UTC
++++ src/MemoryX.h
 @@ -1,6 +1,7 @@
  #ifndef __AUDACITY_MEMORY_X_H__
  #define __AUDACITY_MEMORY_X_H__
@@ -7,13 +7,13 @@
 +#include <stdlib.h>
  // C++ standard header <memory> with a few extensions
  #include <memory>
- #ifndef safenew
-@@ -1171,7 +1172,7 @@
-    namespace tr1
-    {
- #endif
--      template<typename T> struct hash;
-+      //template<typename T> struct hash;
-       template<> struct hash< wxString > {
-          size_t operator () (const wxString &str) const // noexcept
-          {
+ #include <cstdlib> // Needed for free.
+@@ -706,7 +707,7 @@ make_value_transform_iterator(const Iterator &iterator
+ // For using std::unordered_map on wxString
+ namespace std
+ {
+-   template<typename T> struct hash;
++   //template<typename T> struct hash;
+    template<> struct hash< wxString > {
+       size_t operator () (const wxString &str) const // noexcept
+       {