Date: Tue, 25 Jul 2017 11:58:22 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446572 - in head/audio/audacity: . files Message-ID: <201707251158.v6PBwMAe058919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jul 25 11:58:22 2017 New Revision: 446572 URL: https://svnweb.freebsd.org/changeset/ports/446572 Log: - Update to 2.1.3 PR: 218104 Submitted by: xxjack12xx@gmail.com (maintainer) Added: head/audio/audacity/files/patch-include_audacity_Types.h (contents, props changed) head/audio/audacity/files/patch-src_Audacity.h (contents, props changed) Deleted: head/audio/audacity/files/patch-Makefile.am head/audio/audacity/files/patch-include_Makefile.am head/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am head/audio/audacity/files/patch-lib-src_libnyquist_configure.ac head/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac head/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h head/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am head/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 head/audio/audacity/files/patch-src_AudioIO.h head/audio/audacity/files/patch-src_DeviceManager.cpp head/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp Modified: head/audio/audacity/Makefile head/audio/audacity/files/patch-configure.ac head/audio/audacity/pkg-plist Modified: head/audio/audacity/Makefile ============================================================================== --- head/audio/audacity/Makefile Tue Jul 25 11:55:14 2017 (r446571) +++ head/audio/audacity/Makefile Tue Jul 25 11:58:22 2017 (r446572) @@ -22,12 +22,11 @@ BROKEN_aarch64= fails to configure: checking whether 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 @@ -50,7 +49,6 @@ DYNLOAD_DESC= Enable dynamic loading of lame and FFmpe 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 @@ -60,16 +58,17 @@ 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 @@ -130,17 +129,17 @@ 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 <bsd.port.pre.mk> - 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 <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/audacity/files/patch-configure.ac ============================================================================== --- head/audio/audacity/files/patch-configure.ac Tue Jul 25 11:55:14 2017 (r446571) +++ head/audio/audacity/files/patch-configure.ac Tue Jul 25 11:58:22 2017 (r446572) @@ -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 Added: head/audio/audacity/files/patch-include_audacity_Types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-include_audacity_Types.h Tue Jul 25 11:58:22 2017 (r446572) @@ -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<type>(v) } {} + + // Beware implicit conversions from floating point values! + // Otherwise the meaning of binary operators with sampleCount change Added: head/audio/audacity/files/patch-src_Audacity.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-src_Audacity.h Tue Jul 25 11:58:22 2017 (r446572) @@ -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. Modified: head/audio/audacity/pkg-plist ============================================================================== --- head/audio/audacity/pkg-plist Tue Jul 25 11:55:14 2017 (r446571) +++ head/audio/audacity/pkg-plist Tue Jul 25 11:58:22 2017 (r446572) @@ -1,17 +1,16 @@ 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 @@ -80,7 +79,6 @@ share/applications/audacity.desktop %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707251158.v6PBwMAe058919>