Index: head/audio/audacity/Makefile =================================================================== --- head/audio/audacity/Makefile (revision 442253) +++ head/audio/audacity/Makefile (revision 442254) @@ -1,151 +1,148 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.1.2 -PORTREVISION= 5 +PORTVERSION= 2.1.3 CATEGORIES= audio MASTER_SITES= https://github.com/audacity/audacity/archive/ DISTNAME= Audacity-${PORTVERSION} MAINTAINER= xxjack12xx@gmail.com COMMENT= GUI editor for digital audio waveforms LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= autogen:devel/autogen \ bash:shells/bash \ cmake:devel/cmake LIB_DEPENDS= libexpat.so:textproc/expat2 \ libsndfile.so:audio/libsndfile BROKEN_powerpc64= Does not build WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION} GNU_CONFIGURE= yes -USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix +USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" OPTIONS_SUB= yes +USE_GCC= 4.9+ USE_WX= 3.0+ WX_COMPS= wx INSTALLS_ICONS= yes PORTDOCS= README.txt DOS2UNIX_GLOB= Makefile.* *.c* *.h SHEBANG_FILES= lib-src/lv2/build OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \ MAD 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 MIDI_DESC= Use portSMF for Midi support 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_ENV+= WX_CONFIG="${WX_CONFIG}" \ + ax_cv_gcc_4_9_0=yes CONFIGURE_ARGS+= --enable-unicode \ ${ICONV_CONFIGURE_ARG} \ --with-lib-preference="local" \ --with-expat=system \ --with-libsndfile=system \ --with-libsoxr \ --with-portaudio \ --with-midi \ --with-widgetextra \ --with-portmixer=yes CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash DEBUG_CONFIGURE_WITH= debug DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \ docbook2man:textproc/docbook-utils ALSA_CONFIGURE_OFF= --disable-alsa ALSA_CONFIGURE_WITH= alsa ALSA_CFLAGS= -I${LOCALBASE}/include ALSA_CXXFLAGS= -I${LOCALBASE}/include ALSA_LDFLAGS= -L${LOCALBASE}/lib ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib 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 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 VST_CONFIGURE_ENABLE= vst .include - -.if ${CHOSEN_COMPILER_TYPE} == gcc -CXXFLAGS+= -std=c++11 -.endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} 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 442253) +++ head/audio/audacity/distinfo (revision 442254) @@ -1,2 +1,3 @@ -SHA256 (Audacity-2.1.2.tar.gz) = 90007b50cdc3885607b1afef2f158777a61c1658e869a88ec4d98c59c133f9bd -SIZE (Audacity-2.1.2.tar.gz) = 24718129 +TIMESTAMP = 1490408781 +SHA256 (Audacity-2.1.3.tar.gz) = cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86 +SIZE (Audacity-2.1.3.tar.gz) = 24106855 Index: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h =================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h (revision 442253) +++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/nyquist/nyqsrc/sound.h.orig 2016-07-26 13:34:06 UTC -+++ lib-src/libnyquist/nyquist/nyqsrc/sound.h -@@ -459,7 +459,7 @@ double step_to_hz(double); - - #ifdef WIN32 - double log2(double x); --#endif WIN32 -+#endif /*WIN32*/ - - /* macros for access to samples within a suspension */ - /* NOTE: assume suspension structure is named "susp" */ Property changes on: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_nyqsrc_sound.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/audacity/files/patch-src_import_ImportFLAC.cpp =================================================================== --- head/audio/audacity/files/patch-src_import_ImportFLAC.cpp (revision 442253) +++ head/audio/audacity/files/patch-src_import_ImportFLAC.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/import/ImportFLAC.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/import/ImportFLAC.cpp -@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open - int cnt; - wxFile binaryFile; - if (!binaryFile.Open(filename)) { -- return false; // File not found -+ return NULL; // File not found - } - - #ifdef USE_LIBID3TAG -@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open - - if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) { - // File is not a FLAC file -- return false; -+ return NULL; - } - - // Open the file for import Property changes on: head/audio/audacity/files/patch-src_import_ImportFLAC.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp =================================================================== --- head/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp (revision 442253) +++ head/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/effects/VST/VSTEffect.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/effects/VST/VSTEffect.cpp -@@ -2129,7 +2129,7 @@ bool VSTEffect::Load() - // symbols. - // - // Once we define a proper external API, the flags can be removed. -- void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND); -+ void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL); - if (!lib) - { - return false; Property changes on: head/audio/audacity/files/patch-src_effects_VST_VSTEffect.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp =================================================================== --- head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp (revision 442253) +++ head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/effects/vamp/LoadVamp.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/effects/vamp/LoadVamp.cpp -@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co - Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate doesn't matter here - if (!vp) - { -- return false; -+ return NULL; - } - - // We limit the listed plugin outputs to those whose results can Property changes on: head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/audacity/pkg-plist =================================================================== --- head/audio/audacity/pkg-plist (revision 442253) +++ head/audio/audacity/pkg-plist (revision 442254) @@ -1,147 +1,148 @@ bin/audacity include/audacity/ConfigInterface.h include/audacity/EffectAutomationParameters.h include/audacity/EffectInterface.h include/audacity/IdentInterface.h include/audacity/ImporterInterface.h include/audacity/ModuleInterface.h include/audacity/PluginInterface.h include/audacity/Types.h man/man1/audacity.1.gz share/appdata/audacity.appdata.xml share/applications/audacity.desktop %%DATADIR%%/EQDefaultCurves.xml %%DATADIR%%/include/audacity %%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/clicktrack.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/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 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt 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/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