Date: Tue, 14 May 2019 13:38:50 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501658 - in head/audio/audacity: . files Message-ID: <201905141338.x4EDcoXJ054888@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue May 14 13:38:50 2019 New Revision: 501658 URL: https://svnweb.freebsd.org/changeset/ports/501658 Log: audio/audacity: update to 2.3.2 While here, improve formatting PR: 237891 Submitted by: Jack <xxjack12xx@gmail.com> (maintainer) Added: head/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp (contents, props changed) Modified: head/audio/audacity/Makefile (contents, props changed) head/audio/audacity/distinfo (contents, props changed) head/audio/audacity/files/patch-include_audacity_Types.h (contents, props changed) head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac (contents, props changed) head/audio/audacity/files/patch-src_AudioIO.cpp (contents, props changed) head/audio/audacity/files/patch-src_FFmpeg.h (contents, props changed) head/audio/audacity/files/patch-src_MemoryX.h (contents, props changed) head/audio/audacity/pkg-plist (contents, props changed) Modified: head/audio/audacity/Makefile ============================================================================== --- head/audio/audacity/Makefile Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/Makefile Tue May 14 13:38:50 2019 (r501658) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 DISTVERSIONPREFIX= Audacity- CATEGORIES= audio @@ -21,57 +21,58 @@ BUILD_DEPENDS= autogen:devel/autogen \ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libexpat.so:textproc/expat2 \ libportaudio.so:audio/portaudio \ - libsoxr.so:audio/libsoxr \ - libsndfile.so:audio/libsndfile + libsndfile.so:audio/libsndfile \ + libsoxr.so:audio/libsoxr USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \ gettext-tools gmake gnome iconv libtool localbase pkgconfig \ shared-mime-info shebangfix -GNU_CONFIGURE= yes -NLS_USES= gettext-runtime + +GNU_CONFIGURE= yes +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" -OPTIONS_SUB= yes -USE_WX= 3.1+ -WX_COMPS= wx -INSTALLS_ICONS= yes -PORTDOCS= README.txt -DOS2UNIX_GLOB= Makefile.* *.c* *.h -SHEBANG_FILES= lib-src/lv2/build -USE_GITHUB= yes +OPTIONS_SUB= yes +USE_WX= 3.1+ +WX_COMPS= wx +INSTALLS_ICONS= yes +PORTDOCS= README.txt +DOS2UNIX_GLOB= *.c* *.h Makefile.* +SHEBANG_FILES= lib-src/lv2/build +USE_GITHUB= yes -OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \ - MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH STATIC_WX \ - TWOLAME VAMP VORBIS VST -OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \ - SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST +OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \ + MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \ + STATIC_WX 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 +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 +SBSMS_DESC= Use libsbsms for pitch and tempo changing SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing -STATIC_WX_DESC= Link wx statically -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 +STATIC_WX_DESC= Link wx statically +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 \ +CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} \ + --disable-option-checking \ --enable-unicode \ - ${ICONV_CONFIGURE_ARG} \ - --with-lib-preference="local" \ --with-expat=system \ + --with-lib-preference="local" \ --with-libsndfile=system \ --with-libsoxr=system \ --with-midi \ @@ -86,11 +87,13 @@ 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 \ - ${LOCALBASE}/include/lame/lame.h:audio/lame +DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame \ + ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg DYNLOAD_CONFIGURE_ENABLE= dynamic-loading -DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include # for audio/lame -DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib # for audio/lame +# for audio/lame +DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include +# for audio/lame +DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib FFMPEG_CONFIGURE_WITH= ffmpeg=system FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg @@ -104,10 +107,11 @@ ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag JACK_LIB_DEPENDS= libjack.so:audio/jack LADSPA_CONFIGURE_ENABLE= ladspa -LADSPA_RUN_DEPENDS= listplugins:audio/ladspa +LADSPA_RUN_DEPENDS= listplugins:audio/ladspa LAME_CONFIGURE_ON= --with-lame=system -LAME_CONFIGURE_OFF= --with-lame # --without-lame is broken +# --without-lame is broken +LAME_CONFIGURE_OFF= --with-lame LAME_CPPFLAGS= -I${LOCALBASE}/include LAME_LDFLAGS= -L${LOCALBASE}/lib LAME_LIB_DEPENDS= libmp3lame.so:audio/lame @@ -120,14 +124,14 @@ 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_SCRIPT_PIPE_USES= python:3.6+ MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench -MOD_NYQ_BENCH_USES= python:3.6+ +MOD_NYQ_BENCH_USES= python:3.6+ SBSMS_CONFIGURE_WITH= sbsms SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system -SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch +SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch SSE_CONFIGURE_ENABLE= sse @@ -140,8 +144,8 @@ 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 +VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis VST_CONFIGURE_ENABLE= vst Modified: head/audio/audacity/distinfo ============================================================================== --- head/audio/audacity/distinfo Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/distinfo Tue May 14 13:38:50 2019 (r501658) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552123965 -SHA256 (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 2ef1c06f9cdc2ee3d315b8e575dc2bea5b372f4f415f3dc6570c3cfca0f93321 -SIZE (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 27618480 +TIMESTAMP = 1557793254 +SHA256 (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = cc477a71ff5571c72887a7a155365b07a1a50bcea1abf490a4de7b884376c731 +SIZE (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = 61972597 Modified: head/audio/audacity/files/patch-include_audacity_Types.h ============================================================================== --- head/audio/audacity/files/patch-include_audacity_Types.h Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/files/patch-include_audacity_Types.h Tue May 14 13:38:50 2019 (r501658) @@ -1,6 +1,6 @@ --- include/audacity/Types.h.orig 2018-10-01 14:07:33 UTC +++ include/audacity/Types.h -@@ -73,7 +73,7 @@ class sampleCount (public) +@@ -100,7 +100,7 @@ class sampleCount (public) sampleCount ( long v ) : value { v } {} // unsigned long is 64 bit on some platforms. Let it narrow. Modified: head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac ============================================================================== --- head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac Tue May 14 13:38:50 2019 (r501658) @@ -1,6 +1,6 @@ --- 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 "$IMPLEMENTATION" = "wi +@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi echo "Implementation to use: $IMPLEMENTATION" Modified: head/audio/audacity/files/patch-src_AudioIO.cpp ============================================================================== --- head/audio/audacity/files/patch-src_AudioIO.cpp Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/files/patch-src_AudioIO.cpp Tue May 14 13:38:50 2019 (r501658) @@ -1,6 +1,6 @@ --- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC +++ src/AudioIO.cpp -@@ -467,7 +467,6 @@ TimeTrack and AudioIOListener and whether the playback +@@ -479,7 +479,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 -@@ -787,13 +786,22 @@ struct AudioIO::ScrubState (private) +@@ -799,13 +800,22 @@ struct AudioIO::ScrubState (private) // return the system time as a double static double streamStartTime = 0; // bias system time to small number Modified: head/audio/audacity/files/patch-src_FFmpeg.h ============================================================================== --- head/audio/audacity/files/patch-src_FFmpeg.h Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/files/patch-src_FFmpeg.h Tue May 14 13:38:50 2019 (r501658) @@ -1,6 +1,6 @@ --- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC +++ src/FFmpeg.h -@@ -705,7 +705,7 @@ extern "C" { +@@ -671,7 +671,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( AVOutputFormat*, av_oformat_next, @@ -9,7 +9,7 @@ (f) ); #endif -@@ -786,7 +786,7 @@ extern "C" { +@@ -752,7 +752,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( int, av_fifo_size, @@ -18,7 +18,7 @@ (f) ); #endif -@@ -848,7 +848,7 @@ extern "C" { +@@ -814,7 +814,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( AVDictionaryEntry *, av_dict_get, Modified: head/audio/audacity/files/patch-src_MemoryX.h ============================================================================== --- head/audio/audacity/files/patch-src_MemoryX.h Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/files/patch-src_MemoryX.h Tue May 14 13:38:50 2019 (r501658) @@ -1,6 +1,6 @@ --- src/MemoryX.h.orig 2019-03-09 11:55:09 UTC +++ src/MemoryX.h -@@ -628,7 +628,7 @@ make_iterator_range( const Container &container ) +@@ -641,7 +641,7 @@ make_iterator_range( const Container &container ) // For using std::unordered_map on wxString namespace std { Added: head/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-src_prefs_PrefsDialog.cpp Tue May 14 13:38:50 2019 (r501658) @@ -0,0 +1,10 @@ +--- src/prefs/PrefsDialog.cpp.orig 2019-05-13 18:00:33.704997000 -0700 ++++ src/prefs/PrefsDialog.cpp 2019-05-13 17:52:51.702814000 -0700 +@@ -29,6 +29,7 @@ + #include <wx/intl.h> + #include <wx/listbox.h> + #include <wx/sizer.h> ++#include <wx/treectrl.h> + + #include <wx/listbook.h> + Modified: head/audio/audacity/pkg-plist ============================================================================== --- head/audio/audacity/pkg-plist Tue May 14 13:38:20 2019 (r501657) +++ head/audio/audacity/pkg-plist Tue May 14 13:38:50 2019 (r501658) @@ -71,6 +71,7 @@ share/applications/audacity.desktop %%DATADIR%%/plug-ins/limiter.ny %%DATADIR%%/plug-ins/lowpass.ny %%DATADIR%%/plug-ins/notch.ny +%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny %%DATADIR%%/plug-ins/pluck.ny %%DATADIR%%/plug-ins/rhythmtrack.ny %%DATADIR%%/plug-ins/rissetdrum.ny
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905141338.x4EDcoXJ054888>