Index: head/audio/audacity/Makefile =================================================================== --- head/audio/audacity/Makefile (revision 481064) +++ head/audio/audacity/Makefile (revision 481065) @@ -1,144 +1,150 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.2.2 +PORTVERSION= 2.3.0 DISTVERSIONPREFIX= Audacity- -PORTREVISION= 3 CATEGORIES= audio MAINTAINER= xxjack12xx@gmail.com COMMENT= GUI editor for digital audio waveforms LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no BROKEN_powerpc64= fails to build BUILD_DEPENDS= autogen:devel/autogen \ bash:shells/bash \ cmake:devel/cmake LIB_DEPENDS= libasound.so:audio/alsa-lib \ libexpat.so:textproc/expat2 \ libportaudio.so:audio/portaudio \ libsoxr.so:audio/libsoxr \ libsndfile.so:audio/libsndfile USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase GNU_CONFIGURE= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" OPTIONS_SUB= yes USE_WX= 3.0+ WX_COMPS= wx INSTALLS_ICONS= yes PORTDOCS= README.txt DOS2UNIX_GLOB= Makefile.* *.c* *.h 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 OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE} 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 TWOLAME_DESC= Use libtwolame for MP2 export support VAMP_DESC= Vamp plug-in support VST_DESC= VST plug-in support CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ARGS+= --disable-option-checking \ --enable-unicode \ ${ICONV_CONFIGURE_ARG} \ --with-lib-preference="local" \ --with-expat=system \ --with-libsndfile=system \ --with-libsoxr=system \ --with-midi \ --with-portaudio=system \ --with-portmixer=yes \ --with-widgetextra CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash DEBUG_CONFIGURE_WITH= debug DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \ docbook2man:textproc/docbook-utils DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame DYNLOAD_CONFIGURE_ENABLE= dynamic-loading DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include # for audio/lame using DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib # for audio/lame using FFMPEG_CONFIGURE_WITH= ffmpeg=system FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FLAC_CONFIGURE_WITH= libflac=system FLAC_LIB_DEPENDS= libFLAC.so:audio/flac ID3TAG_CONFIGURE_WITH= libid3tag=system ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag 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 LAME_LDFLAGS= -L${LOCALBASE}/lib LAME_LIB_DEPENDS= libmp3lame.so:audio/lame 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 SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch SSE_CONFIGURE_ENABLE= sse TWOLAME_CONFIGURE_WITH= libtwolame=system TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame VAMP_CONFIGURE_WITH= libvamp=system VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk VORBIS_CONFIGURE_WITH= libvorbis=system VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg VST_CONFIGURE_ENABLE= vst post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/audio/audacity/distinfo =================================================================== --- head/audio/audacity/distinfo (revision 481064) +++ head/audio/audacity/distinfo (revision 481065) @@ -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 Index: head/audio/audacity/files/patch-configure.ac =================================================================== --- head/audio/audacity/files/patch-configure.ac (revision 481064) +++ head/audio/audacity/files/patch-configure.ac (revision 481065) @@ -1,24 +1,24 @@ ---- 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) - -dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions -if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then - - dnl GCC < 4.9 has known bugs (#1397) and can't be used - AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no]) - if test x$gcc_ok = xno; then - AC_MSG_ERROR([Audacity requires at least GCC 4.9]) - fi - - CXXFLAGS="${CXXFLAGS} --std=gnu++11" -else - CXXFLAGS="${CXXFLAGS} --std=c++11" -fi +CXXFLAGS="${CXXFLAGS} --std=c++11" dnl -------------------------------------------------------------------------- dnl We would like warnings enabled on the builds, but different compilers need Index: head/audio/audacity/files/patch-include_audacity_Types.h =================================================================== --- head/audio/audacity/files/patch-include_audacity_Types.h (revision 481064) +++ head/audio/audacity/files/patch-include_audacity_Types.h (revision 481065) @@ -1,11 +1,11 @@ ---- 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. - sampleCount ( unsigned long v ) : value ( v ) {} + sampleCount ( unsigned long v ) : value { static_cast(v) } {} // Beware implicit conversions from floating point values! // Otherwise the meaning of binary operators with sampleCount change Index: head/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am =================================================================== --- head/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am (revision 481064) +++ head/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am (revision 481065) @@ -1,52 +1,52 @@ ---- 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 +SUBDIRS= $(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR) +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 -libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS) -libFileDialog_la_LIBADD += $(GTK_LIBS) +GTK_SUBDIR= gtk +libFileDialog_la_LIBADD += \ + gtk/libFileDialog.la \ + $(NULL) libFileDialog_la_SOURCES += \ - gtk/FileDialogPrivate.cpp \ gtk/FileDialogPrivate.h \ $(NULL) endif if MAC -libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \ - mac/FileDialogPrivate.h \ - $(NULL) +MAC_SUBDIR= mac +libFileDialog_la_LIBADD+= \ + mac/libFileDialog.la \ + $(NULL) +libFileDialog_la_SOURCES += \ + mac/FileDialogPrivate.h \ + $(NULL) +#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm endif if WINDOWS -libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \ - win/FileDialogPrivate.h \ - $(NULL) +WINDOWS_SUBDIR= win +libFileDialog_la_LIBADD+= \ + win/libFileDialog.la \ + $(NULL) +libFileDialog_la_SOURCES += \ + win/FileDialogPrivate.h \ + $(NULL) endif Index: head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac =================================================================== --- head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac (revision 481064) +++ head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac (revision 481065) @@ -1,11 +1,11 @@ ---- 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" -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile]) # # Write it all out Index: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h =================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (revision 481064) +++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (revision 481065) @@ -1,11 +1,11 @@ ---- 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 #endif -#if NEED_ULONG +#if NEED_ULONG || __FreeBSD__ typedef unsigned long ulong; #endif Index: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h =================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (revision 481064) +++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (revision 481065) @@ -1,18 +1,18 @@ --- 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 +/* FreeBSD */ +#ifdef __FreeBSD__ +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define XL_LITTLE_ENDIAN +#else +#define XL_BIG_ENDIAN +#endif +#endif + /* Apple CC */ #ifdef __APPLE__ #define NNODES 2000 Index: head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c =================================================================== --- head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c (revision 481064) +++ head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c (revision 481065) @@ -1,42 +1,42 @@ ---- 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" -#include "sys/timeb.h" #include "pthread.h" #define TRUE 1 #define FALSE 0 static int time_started_flag = FALSE; -static struct timeb time_offset = {0, 0, 0, 0}; +static struct timeval time_offset = {0}; 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; - ftime(&time_offset); /* need this set before process runs */ + gettimeofday(&time_offset, 0); 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; - struct timeb now; - ftime(&now); - seconds = now.time - time_offset.time; - milliseconds = now.millitm - time_offset.millitm; + struct timeval now; + gettimeofday(&now, 0); + seconds = now.tv_sec - time_offset.tv_sec; + milliseconds = (now.tv_usec / 1000) - (time_offset.tv_usec / 1000); return seconds * 1000 + milliseconds; } Index: head/audio/audacity/files/patch-src_AudioIO.cpp =================================================================== --- head/audio/audacity/files/patch-src_AudioIO.cpp (revision 481064) +++ head/audio/audacity/files/patch-src_AudioIO.cpp (revision 481065) @@ -1,34 +1,34 @@ ---- 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 #include "../lib-src/portmidi/pm_common/portmidi.h" - #include "../lib-src/portaudio-v19/src/common/pa_util.h" #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 +// PaUtil_GetTime is an internal PortAudio function. Unfortunately +// it's used twice in AudioIO.cpp. It's a simple function so just +// provide the implementation here. +static double PaUtil_GetTime(void) { + struct timespec tp; + clock_gettime(CLOCK_REALTIME, &tp); + return (double)(tp.tv_sec + tp.tv_nsec * 1e-9); +} + static double SystemTime(bool usingAlsa) { #ifdef __WXGTK__ if (usingAlsa) { struct timespec now; // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time - clock_gettime(CLOCK_MONOTONIC_RAW, &now); + clock_gettime(CLOCK_REALTIME, &now); //return now.tv_sec + now.tv_nsec * 0.000000001; return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime; } Index: head/audio/audacity/files/patch-src_FFmpeg.h =================================================================== --- head/audio/audacity/files/patch-src_FFmpeg.h (revision 481064) +++ head/audio/audacity/files/patch-src_FFmpeg.h (revision 481065) @@ -1,29 +1,29 @@ ---- 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, - (AVOutputFormat *f), + (const AVOutputFormat *f), (f) ); + #endif +@@ -786,7 +786,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( -@@ -756,7 +756,7 @@ extern "C" { - FFMPEG_FUNCTION_WITH_RETURN( int, av_fifo_size, - (AVFifoBuffer *f), + (const AVFifoBuffer *f), (f) ); + #endif +@@ -848,7 +848,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( -@@ -802,7 +802,7 @@ extern "C" { - FFMPEG_FUNCTION_WITH_RETURN( AVDictionaryEntry *, av_dict_get, - (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), (m, key, prev, flags) ); - FFMPEG_FUNCTION_WITH_RETURN( + #endif Index: head/audio/audacity/files/patch-src_Makefile.am =================================================================== --- head/audio/audacity/files/patch-src_Makefile.am (revision 481064) +++ head/audio/audacity/files/patch-src_Makefile.am (revision 481065) @@ -1,12 +1,12 @@ --- 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") ); # ^ -audacity_CXXFLAGS = \ - -Wno-unused-local-typedefs +audacity_CXXFLAGS = audacity_LDFLAGS = -rdynamic audacity_LDADD = \ Index: head/audio/audacity/files/patch-src_MemoryX.h =================================================================== --- head/audio/audacity/files/patch-src_MemoryX.h (revision 481064) +++ head/audio/audacity/files/patch-src_MemoryX.h (revision 481065) @@ -1,19 +1,19 @@ ---- 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__ +#include // C++ standard header with a few extensions #include - #ifndef safenew -@@ -1171,7 +1172,7 @@ - namespace tr1 - { - #endif -- template struct hash; -+ //template struct hash; - template<> struct hash< wxString > { - size_t operator () (const wxString &str) const // noexcept - { + #include // Needed for free. +@@ -706,7 +707,7 @@ make_value_transform_iterator(const Iterator &iterator + // For using std::unordered_map on wxString + namespace std + { +- template struct hash; ++ //template struct hash; + template<> struct hash< wxString > { + size_t operator () (const wxString &str) const // noexcept + {