Index: head/audio/audacity/Makefile =================================================================== --- head/audio/audacity/Makefile (revision 446571) +++ head/audio/audacity/Makefile (revision 446572) @@ -1,146 +1,145 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> # $FreeBSD$ PORTNAME= audacity PORTVERSION= 2.1.3 DISTVERSIONPREFIX= Audacity- CATEGORIES= audio 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_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no BROKEN_powerpc64= fails to build GNU_CONFIGURE= yes -USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix +USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" OPTIONS_SUB= yes -USE_GCC= 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 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_ARGS+= --enable-unicode \ +CONFIGURE_ARGS+= --disable-option-checking \ + --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 + --with-portaudio \ + --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 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 +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg VST_CONFIGURE_ENABLE= vst -.include - 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 +.include Index: head/audio/audacity/files/patch-lib-src_libnyquist_configure.ac =================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_configure.ac (revision 446571) +++ head/audio/audacity/files/patch-lib-src_libnyquist_configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/configure.ac.orig 2016-01-08 22:05:48 UTC -+++ lib-src/libnyquist/configure.ac -@@ -117,6 +117,8 @@ dnl Checks for typedefs, structures, and - AC_C_CONST - AC_TYPE_SIZE_T - -+AC_SUBST([SNDFILE_CFLAGS]) -+ - AC_CONFIG_FILES([Makefile]) - - AC_OUTPUT Property changes on: head/audio/audacity/files/patch-lib-src_libnyquist_configure.ac ___________________________________________________________________ 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-lib-src_libnyquist_Makefile.am =================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am (revision 446571) +++ head/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ lib-src/libnyquist/Makefile.am -@@ -3,7 +3,7 @@ - # Written by Richard Ash following Gary Vaughan's Autobook - - PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include --SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src -+#SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src - - # tell aclocal that extra macros can be found in autotools/m4/ - ACLOCAL_AMFLAGS = -I autotools/m4 Property changes on: head/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am ___________________________________________________________________ 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-Makefile.am =================================================================== --- head/audio/audacity/files/patch-Makefile.am (revision 446571) +++ head/audio/audacity/files/patch-Makefile.am (nonexistent) @@ -1,23 +0,0 @@ ---- Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = help images lib-src po src tests -+SUBDIRS = help images include lib-src po src tests - - ACLOCAL_AMFLAGS = -I m4 - -@@ -8,14 +8,6 @@ dist_doc_DATA = LICENSE.txt README.txt - dist_pkgdata_DATA = presets/EQDefaultCurves.xml - - nobase_dist_pkgdata_DATA = \ -- 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 \ - nyquist/dspprims.lsp \ - nyquist/envelopes.lsp \ - nyquist/equalizer.lsp \ Property changes on: head/audio/audacity/files/patch-Makefile.am ___________________________________________________________________ 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-m4_audacity__checklib__libsndfile.m4 =================================================================== --- head/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 (revision 446571) +++ head/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 (nonexistent) @@ -1,10 +0,0 @@ ---- m4/audacity_checklib_libsndfile.m4.orig 2016-01-08 22:05:48 UTC -+++ m4/audacity_checklib_libsndfile.m4 -@@ -50,6 +50,7 @@ AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [ - SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a' - AC_CONFIG_SUBDIRS([lib-src/libsndfile]) - fi -+ export SNDFILE_CFLAGS - - AC_SUBST([SNDFILE_CFLAGS]) - AC_SUBST([SNDFILE_LIBS]) Property changes on: head/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 ___________________________________________________________________ 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_AudioIO.h =================================================================== --- head/audio/audacity/files/patch-src_AudioIO.h (revision 446571) +++ head/audio/audacity/files/patch-src_AudioIO.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/AudioIO.h.orig 2016-07-26 13:34:06 UTC -+++ src/AudioIO.h -@@ -13,7 +13,7 @@ - #ifndef __AUDACITY_AUDIO_IO__ - #define __AUDACITY_AUDIO_IO__ - --#include "portaudio.h" -+#include "../lib-src/portaudio-v19/include/portaudio.h" - #include "Audacity.h" - #include "Experimental.h" - Property changes on: head/audio/audacity/files/patch-src_AudioIO.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_prefs_DevicePrefs.cpp =================================================================== --- head/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp (revision 446571) +++ head/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/prefs/DevicePrefs.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/prefs/DevicePrefs.cpp -@@ -30,7 +30,7 @@ other settings. - #include - #include - --#include "portaudio.h" -+#include "../../lib-src/portaudio-v19/include/portaudio.h" - - #include "../AudioIO.h" - #include "../Internat.h" Property changes on: head/audio/audacity/files/patch-src_prefs_DevicePrefs.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-lib-src_portmixer_include_portmixer.h =================================================================== --- head/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h (revision 446571) +++ head/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/portmixer/include/portmixer.h.orig 2016-07-26 13:34:07 UTC -+++ lib-src/portmixer/include/portmixer.h -@@ -45,7 +45,7 @@ extern "C" - * - */ - --#include "portaudio.h" -+#include "../../portaudio-v19/include/portaudio.h" - - typedef void PxMixer; - Property changes on: head/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.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-lib-src_portaudio-v19_bindings_cpp_configure.ac =================================================================== --- head/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac (revision 446571) +++ head/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig 2016-01-08 22:05:48 UTC -+++ lib-src/portaudio-v19/bindings/cpp/configure.ac -@@ -14,7 +14,7 @@ m4_define([lt_age], [0]) - - AC_INIT([PortAudioCpp], [12]) - AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([subdir-objects]) - AM_MAINTAINER_MODE - - ###### Top-level directory of pacpp Property changes on: head/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac ___________________________________________________________________ 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-lib-src_soundtouch_source_SoundTouch_Makefile.am =================================================================== --- head/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am (revision 446571) +++ head/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ lib-src/soundtouch/source/SoundTouch/Makefile.am -@@ -32,7 +32,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FI - - - # Compiler flags --AM_CXXFLAGS=-O3 -fcheck-new -I../../include -+AM_CXXFLAGS=-O3 -I../../include - - # Compile the files that need MMX and SSE individually. - libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la Property changes on: head/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am ___________________________________________________________________ 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-include_Makefile.am =================================================================== --- head/audio/audacity/files/patch-include_Makefile.am (revision 446571) +++ head/audio/audacity/files/patch-include_Makefile.am (nonexistent) @@ -1,24 +0,0 @@ ---- include/Makefile.am.orig 2016-07-26 13:34:07 UTC -+++ include/Makefile.am -@@ -0,0 +1,21 @@ -+ACLOCAL_AMFLAGS= -I m4 -+ -+pkginclude_HEADERS= \ -+ audacity/ConfigInterface.h \ -+ audacity/EffectAutomationParameters.h \ -+ audacity/EffectInterface.h \ -+ audacity/IdentInterface.h \ -+ audacity/ImporterInterface.h \ -+ audacity/ModuleInterface.h \ -+ audacity/PluginInterface.h \ -+ audacity/Types.h \ -+ $(NULL) -+ -+pkgdataincludedir= $(pkgdatadir)/include -+ -+install-data-local: install-data-include -+install-data-include: -+ $(MKDIR_P) "$(DESTDIR)$(pkgdataincludedir)" -+ $(LN_S) "$(pkgincludedir)" "$(DESTDIR)$(pkgdataincludedir)/" -+ -+.PHONY: install-data-include Property changes on: head/audio/audacity/files/patch-include_Makefile.am ___________________________________________________________________ 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_DeviceManager.cpp =================================================================== --- head/audio/audacity/files/patch-src_DeviceManager.cpp (revision 446571) +++ head/audio/audacity/files/patch-src_DeviceManager.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/DeviceManager.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/DeviceManager.cpp -@@ -6,7 +6,7 @@ - - ******************************************************************/ - --#include "portaudio.h" -+#include "../lib-src/portaudio-v19/include/portaudio.h" - #ifdef __WXMSW__ - #include "pa_win_wasapi.h" - #endif Property changes on: head/audio/audacity/files/patch-src_DeviceManager.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-configure.ac =================================================================== --- head/audio/audacity/files/patch-configure.ac (revision 446571) +++ head/audio/audacity/files/patch-configure.ac (revision 446572) @@ -1,18 +1,24 @@ --- configure.ac.orig 2016-01-08 22:05:48 UTC +++ configure.ac -@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4]) +@@ -235,20 +236,7 @@ + dnl Solaris builds, by defining HAVE_ALLOCA_H + AC_CHECK_HEADERS_ONCE(alloca.h) - AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar]) - AM_MAINTAINER_MODE([disable]) -+AM_SILENT_RULES([yes]) +- +-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions +-if test "${ax_cv_c_compiler_vendor}" = "gnu"; 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" - AM_GNU_GETTEXT_VERSION([0.18]) - AM_GNU_GETTEXT([external]) -@@ -690,6 +691,7 @@ AC_CONFIG_FILES([ - Makefile - help/Makefile - images/Makefile -+ include/Makefile - lib-src/Makefile - po/Makefile.in - src/audacity.desktop + 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 (nonexistent) +++ head/audio/audacity/files/patch-include_audacity_Types.h (revision 446572) @@ -0,0 +1,11 @@ +--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC ++++ include/audacity/Types.h +@@ -70,7 +70,7 @@ public: + sampleCount ( int v ) : value { v } {} + sampleCount ( unsigned v ) : value { v } {} + sampleCount ( long v ) : value { v } {} +- 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 Property changes on: head/audio/audacity/files/patch-include_audacity_Types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/audacity/files/patch-src_Audacity.h =================================================================== --- head/audio/audacity/files/patch-src_Audacity.h (nonexistent) +++ head/audio/audacity/files/patch-src_Audacity.h (revision 446572) @@ -0,0 +1,16 @@ +--- src/Audacity.h.orig 2017-06-16 13:26:40 UTC ++++ src/Audacity.h +@@ -24,13 +24,6 @@ + #ifndef __AUDACITY_H__ + #define __AUDACITY_H__ + +-// If building with GNU compiler, then must be 4.9 or later. +-// TODO: This would be much nicer as a standalone test in configure.ac +-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)) +-#error insufficient compiler +-#endif +- +- + // We only do alpha builds and release versions. + // Most of the time we're in development, so IS_ALPHA should be defined + // to 1. Property changes on: head/audio/audacity/files/patch-src_Audacity.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/audacity/pkg-plist =================================================================== --- head/audio/audacity/pkg-plist (revision 446571) +++ head/audio/audacity/pkg-plist (revision 446572) @@ -1,148 +1,146 @@ 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%%/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/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/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