Date: Tue, 2 Feb 2016 23:13:07 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407904 - in head/audio/audacity: . files Message-ID: <201602022313.u12ND7fd001734@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Tue Feb 2 23:13:07 2016 New Revision: 407904 URL: https://svnweb.freebsd.org/changeset/ports/407904 Log: Add LV2 OPTION, remove MIDI OPTION, strip binary, fix build on 9.3 PR: 206694 Submitted by: xxjack12xx@gmail.com (maintainer) MFH: 2016Q1 Added: head/audio/audacity/files/patch-lib-src_lv2_configure (contents, props changed) head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp (contents, props changed) head/audio/audacity/files/patch-src_import_ImportFLAC.cpp (contents, props changed) Deleted: head/audio/audacity/files/patch-lib-src__libsoxr__configure head/audio/audacity/files/patch-lib-src__lv2__Makefile Modified: head/audio/audacity/Makefile Modified: head/audio/audacity/Makefile ============================================================================== --- head/audio/audacity/Makefile Tue Feb 2 23:12:12 2016 (r407903) +++ head/audio/audacity/Makefile Tue Feb 2 23:13:07 2016 (r407904) @@ -24,7 +24,7 @@ BUILD_DEPENDS+= autogen:${PORTSDIR}/deve WRKSRC= ${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION} GNU_CONFIGURE= yes -USES= compiler:c11 cpe desktop-file-utils gmake pkgconfig shared-mime-info shebangfix dos2unix +USES= compiler:c++11-lib cpe desktop-file-utils gmake pkgconfig shared-mime-info shebangfix dos2unix NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPTIONS_SUB= yes @@ -32,12 +32,12 @@ USE_WX= 3.0+ WX_COMPS= wx INSTALLS_ICONS= yes PORTDOCS= README.txt -INSTALL_TARGET= install-strip DOS2UNIX_GLOB= Makefile.* *.c* *.h +SHEBANG_FILES= lib-src/lv2/build -OPTIONS_DEFINE= NLS DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI \ +OPTIONS_DEFINE= NLS DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \ SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST -OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI \ +OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \ SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST OPTIONS_DEFINE_amd64= SSE @@ -47,6 +47,7 @@ OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:M DEBUG_DESC= Enable debug support 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 @@ -58,7 +59,7 @@ VST_DESC= VST plug-in support CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" -CONFIGURE_ARGS+= --with-lib-preference="local system" --without-lv2 \ +CONFIGURE_ARGS+= --with-lib-preference="local system" \ --enable-portaudio --enable-unicode --with-libsoxr CONFIGURE_SHELL?=${LOCALBASE}/bin/bash @@ -85,11 +86,11 @@ LADSPA_RUN_DEPENDS= listplugins:${PORTSD MAD_CONFIGURE_WITH= libmad MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad -MIDI_CONFIGURE_WITH= midi - LAME_CONFIGURE_WITH= lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame +LV2_CONFIGURE_WITH= lv2 + SBSMS_CONFIGURE_WITH= sbsms SOUNDTOUCH_CONFIGURE_WITH= soundtouch @@ -114,8 +115,15 @@ CFLAGS+= -I${WRKSRC}/lib-src/portsmf \ -I${WRKSRC}/lib-src/portaudio-v19/include \ -I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc +CXXFLAGS+= -std=c++11 +.endif + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/audio/audacity/files/patch-lib-src_lv2_configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-lib-src_lv2_configure Tue Feb 2 23:13:07 2016 (r407904) @@ -0,0 +1,10 @@ +--- lib-src/lv2/configure 2016-01-08 14:05:48.000000000 -0800 ++++ lib-src/lv2/configure 2016-01-27 17:18:31.280753000 -0800 +@@ -54,7 +54,7 @@ + Name: ${pkg} + Version: ${version} + Description: Temporary fake config file +-Libs: -L\${libdir} ${lib} -ldl -lm ++Libs: -L\${libdir} ${lib} -lm + Cflags: -I\${includedir}/${pkg}${major} + EOF Added: head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-src_effects_vamp_LoadVamp.cpp Tue Feb 2 23:13:07 2016 (r407904) @@ -0,0 +1,11 @@ +--- src/effects/vamp/LoadVamp.cpp.orig 2016-01-08 22:05:48 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 Added: head/audio/audacity/files/patch-src_import_ImportFLAC.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-src_import_ImportFLAC.cpp Tue Feb 2 23:13:07 2016 (r407904) @@ -0,0 +1,20 @@ +--- src/import/ImportFLAC.cpp.orig 2016-01-08 22:05:48 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602022313.u12ND7fd001734>