Index: head/audio/audacity/Makefile =================================================================== --- head/audio/audacity/Makefile (revision 495223) +++ head/audio/audacity/Makefile (revision 495224) @@ -1,151 +1,156 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 DISTVERSIONPREFIX= Audacity- -PORTREVISION= 5 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 +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 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_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \ - MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH 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 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 +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 \ --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 \ ${LOCALBASE}/include/lame/lame.h:audio/lame DYNLOAD_CONFIGURE_ENABLE= dynamic-loading DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include # for audio/lame DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib # for audio/lame 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 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 + +STATIC_WX_ENABLE= static-wx 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 495223) +++ head/audio/audacity/distinfo (revision 495224) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538360236 -SHA256 (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e -SIZE (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 27479664 +TIMESTAMP = 1552123965 +SHA256 (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 2ef1c06f9cdc2ee3d315b8e575dc2bea5b372f4f415f3dc6570c3cfca0f93321 +SIZE (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 27618480 Index: head/audio/audacity/files/patch-configure.ac =================================================================== --- head/audio/audacity/files/patch-configure.ac (revision 495223) +++ head/audio/audacity/files/patch-configure.ac (revision 495224) @@ -1,24 +1,39 @@ ---- configure.ac.orig 2018-09-20 14:35:07 UTC +--- configure.ac.orig 2019-02-24 08:28:05 UTC +++ configure.ac -@@ -235,20 +235,7 @@ dnl check if alloca.h exists. If it does, we need to i +@@ -204,14 +204,6 @@ if test x$enable_universal_binary = xyes; then + esac + fi + +-dnl Check if $CXX is clang by evaluating the version string because +-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty). +-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed. +-dnl Use /dev/null to suppress grep output to shell. +-if ($CXX --version | grep 'clang version' > /dev/null); then +- LDFLAGS="${LDFLAGS} -latomic" +-fi +- + if test x$enable_sse = xyes; then + + if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then +@@ -243,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-src_MemoryX.h =================================================================== --- head/audio/audacity/files/patch-src_MemoryX.h (revision 495223) +++ head/audio/audacity/files/patch-src_MemoryX.h (revision 495224) @@ -1,19 +1,11 @@ ---- src/MemoryX.h.orig 2018-10-01 14:07:33 UTC +--- src/MemoryX.h.orig 2019-03-09 11:55:09 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 - #include // Needed for free. -@@ -706,7 +707,7 @@ make_value_transform_iterator(const Iterator &iterator +@@ -628,7 +628,7 @@ make_iterator_range( const Container &container ) // 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 { Index: head/audio/audacity/pkg-plist =================================================================== --- head/audio/audacity/pkg-plist (revision 495223) +++ head/audio/audacity/pkg-plist (revision 495224) @@ -1,147 +1,149 @@ bin/audacity man/man1/audacity.1.gz share/appdata/audacity.appdata.xml share/applications/audacity.desktop %%DATADIR%%/EQDefaultCurves.xml +%%DATADIR%%/include/audacity/ComponentInterface.h %%DATADIR%%/include/audacity/ConfigInterface.h %%DATADIR%%/include/audacity/EffectAutomationParameters.h %%DATADIR%%/include/audacity/EffectInterface.h -%%DATADIR%%/include/audacity/IdentInterface.h %%DATADIR%%/include/audacity/ImporterInterface.h %%DATADIR%%/include/audacity/ModuleInterface.h %%DATADIR%%/include/audacity/PluginInterface.h %%DATADIR%%/include/audacity/Types.h +%%DATADIR%%/nyquist/aud-do-support.lsp %%DATADIR%%/nyquist/dspprims.lsp %%DATADIR%%/nyquist/envelopes.lsp %%DATADIR%%/nyquist/equalizer.lsp %%DATADIR%%/nyquist/evalenv.lsp %%DATADIR%%/nyquist/fileio.lsp %%DATADIR%%/nyquist/follow.lsp %%DATADIR%%/nyquist/init.lsp %%DATADIR%%/nyquist/misc.lsp %%DATADIR%%/nyquist/nyinit.lsp %%DATADIR%%/nyquist/nyqmisc.lsp %%DATADIR%%/nyquist/nyquist-plot.txt %%DATADIR%%/nyquist/nyquist.lsp %%DATADIR%%/nyquist/printrec.lsp %%DATADIR%%/nyquist/profile.lsp %%DATADIR%%/nyquist/rawwaves/mand1.raw %%DATADIR%%/nyquist/rawwaves/mand10.raw %%DATADIR%%/nyquist/rawwaves/mand11.raw %%DATADIR%%/nyquist/rawwaves/mand12.raw %%DATADIR%%/nyquist/rawwaves/mand2.raw %%DATADIR%%/nyquist/rawwaves/mand3.raw %%DATADIR%%/nyquist/rawwaves/mand4.raw %%DATADIR%%/nyquist/rawwaves/mand5.raw %%DATADIR%%/nyquist/rawwaves/mand6.raw %%DATADIR%%/nyquist/rawwaves/mand7.raw %%DATADIR%%/nyquist/rawwaves/mand8.raw %%DATADIR%%/nyquist/rawwaves/mand9.raw %%DATADIR%%/nyquist/rawwaves/mandpluk.raw %%DATADIR%%/nyquist/rawwaves/marmstk1.raw %%DATADIR%%/nyquist/rawwaves/sinewave.raw %%DATADIR%%/nyquist/sal-parse.lsp %%DATADIR%%/nyquist/sal.lsp %%DATADIR%%/nyquist/seq.lsp %%DATADIR%%/nyquist/seqfnint.lsp %%DATADIR%%/nyquist/seqmidi.lsp %%DATADIR%%/nyquist/sndfnint.lsp %%DATADIR%%/nyquist/stk.lsp %%DATADIR%%/nyquist/system.lsp %%DATADIR%%/nyquist/test.lsp %%DATADIR%%/nyquist/upic.sal %%DATADIR%%/nyquist/velocity.lsp %%DATADIR%%/nyquist/xlinit.lsp %%DATADIR%%/nyquist/xm.lsp %%DATADIR%%/plug-ins/SilenceMarker.ny %%DATADIR%%/plug-ins/SoundFinder.ny %%DATADIR%%/plug-ins/SpectralEditMulti.ny %%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny %%DATADIR%%/plug-ins/SpectralEditShelves.ny %%DATADIR%%/plug-ins/StudioFadeOut.ny %%DATADIR%%/plug-ins/adjustable-fade.ny %%DATADIR%%/plug-ins/beat.ny %%DATADIR%%/plug-ins/clipfix.ny %%DATADIR%%/plug-ins/crossfadeclips.ny %%DATADIR%%/plug-ins/crossfadetracks.ny %%DATADIR%%/plug-ins/delay.ny %%DATADIR%%/plug-ins/equalabel.ny %%DATADIR%%/plug-ins/highpass.ny %%DATADIR%%/plug-ins/limiter.ny %%DATADIR%%/plug-ins/lowpass.ny %%DATADIR%%/plug-ins/notch.ny %%DATADIR%%/plug-ins/pluck.ny %%DATADIR%%/plug-ins/rhythmtrack.ny %%DATADIR%%/plug-ins/rissetdrum.ny +%%DATADIR%%/plug-ins/rms.ny %%DATADIR%%/plug-ins/sample-data-export.ny %%DATADIR%%/plug-ins/sample-data-import.ny %%DATADIR%%/plug-ins/tremolo.ny %%DATADIR%%/plug-ins/vocalrediso.ny %%DATADIR%%/plug-ins/vocalremover.ny %%DATADIR%%/plug-ins/vocoder.ny share/icons/hicolor/16x16/apps/audacity.png share/icons/hicolor/22x22/apps/audacity.png share/icons/hicolor/24x24/apps/audacity.png share/icons/hicolor/32x32/apps/audacity.png share/icons/hicolor/48x48/apps/audacity.png share/icons/hicolor/scalable/apps/audacity.svg %%NLS%%share/locale/af/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ar/LC_MESSAGES/audacity.mo %%NLS%%share/locale/be/LC_MESSAGES/audacity.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacity.mo %%NLS%%share/locale/bn/LC_MESSAGES/audacity.mo %%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo %%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo %%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo %%NLS%%share/locale/da/LC_MESSAGES/audacity.mo %%NLS%%share/locale/de/LC_MESSAGES/audacity.mo %%NLS%%share/locale/el/LC_MESSAGES/audacity.mo %%NLS%%share/locale/es/LC_MESSAGES/audacity.mo %%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo %%NLS%%share/locale/eu_ES/LC_MESSAGES/audacity.mo %%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo %%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ga/LC_MESSAGES/audacity.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacity.mo %%NLS%%share/locale/he/LC_MESSAGES/audacity.mo %%NLS%%share/locale/hi/LC_MESSAGES/audacity.mo %%NLS%%share/locale/hr/LC_MESSAGES/audacity.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacity.mo %%NLS%%share/locale/hy/LC_MESSAGES/audacity.mo %%NLS%%share/locale/id/LC_MESSAGES/audacity.mo %%NLS%%share/locale/it/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ja/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ka/LC_MESSAGES/audacity.mo %%NLS%%share/locale/km/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo %%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo %%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo %%NLS%%share/locale/my/LC_MESSAGES/audacity.mo %%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo %%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo %%NLS%%share/locale/oc/LC_MESSAGES/audacity.mo %%NLS%%share/locale/pl/LC_MESSAGES/audacity.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/audacity.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ro/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ru/LC_MESSAGES/audacity.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacity.mo %%NLS%%share/locale/sl/LC_MESSAGES/audacity.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacity.mo %%NLS%%share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo %%NLS%%share/locale/sv/LC_MESSAGES/audacity.mo %%NLS%%share/locale/ta/LC_MESSAGES/audacity.mo %%NLS%%share/locale/tg/LC_MESSAGES/audacity.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacity.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacity.mo %%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo share/mime/packages/audacity.xml share/pixmaps/audacity.xpm share/pixmaps/audacity16.xpm share/pixmaps/audacity32.xpm share/pixmaps/gnome-mime-application-x-audacity-project.xpm