svn commit: r539344 - in head/audio/audacity: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Tue Jun 16 12:14:29 UTC 2020
Author: danfe
Date: Tue Jun 16 12:14:27 2020
New Revision: 539344
URL: https://svnweb.freebsd.org/changeset/ports/539344
Log:
- Update `audio/audacity' to the latest version 2.4.1
- Switch to purely CMake-based build, remove autotools-related
patches and Makefile knobs
- Force PLIST_SUB+=NLS="" temporarily while the proper fix is
being developed, to reduce the churn of the pkg-plist
- Do not force C++14 while C++11 is sufficient for the time being
- Do not hardcode Python version when building the manual page
PR: 246645
Added:
head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt (contents, props changed)
head/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt (contents, props changed)
Deleted:
head/audio/audacity/files/patch-configure.ac
head/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
head/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
head/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am
head/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am
head/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am
head/audio/audacity/files/patch-lib-src_lv2_configure
head/audio/audacity/files/patch-src_Makefile.am
Modified:
head/audio/audacity/Makefile
head/audio/audacity/distinfo
head/audio/audacity/pkg-plist
Modified: head/audio/audacity/Makefile
==============================================================================
--- head/audio/audacity/Makefile Tue Jun 16 11:58:44 2020 (r539343)
+++ head/audio/audacity/Makefile Tue Jun 16 12:14:27 2020 (r539344)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= audacity
-PORTVERSION= 2.3.3
-PORTREVISION= 2
+PORTVERSION= 2.4.1
DISTVERSIONPREFIX= Audacity-
CATEGORIES= audio
@@ -13,131 +12,125 @@ 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= libasound.so:audio/alsa-lib \
libexpat.so:textproc/expat2 \
libportaudio.so:audio/portaudio \
libsndfile.so:audio/libsndfile \
libsoxr.so:audio/libsoxr
-USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
- gettext-tools gmake gnome iconv libtool localbase pkgconfig \
- shared-mime-info shebangfix
+USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \
+ gnome libtool python:build pkgconfig shared-mime-info
+USE_GITHUB= yes
+USE_GNOME= cairo gtk30
+USE_WX= 3.1+
+WX_COMPS= wx
+INSTALLS_ICONS= yes
+PORTDOCS= README.txt
-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= *.c* *.h Makefile.*
-SHEBANG_FILES= lib-src/lv2/build
-USE_GITHUB= yes
+CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \
+ -Daudacity_use_expat:STRING=system \
+ -Daudacity_use_wxwidgets:STRING=system \
+ -Daudacity_use_soxr:STRING=system \
+ -Daudacity_use_sndfile:STRING=system \
+ -Daudacity_use_portsmf:STRING=local \
+ -Daudacity_use_portmixer:STRING=local \
+ -Daudacity_use_portaudio:STRING=system
-OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
- MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \
- SSE TWOLAME VAMP VORBIS VST
-OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \
+OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
+ MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
VORBIS VST
+OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
+ SOUNDTOUCH TWOLAME VAMP VORBIS VST
-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
+MIDI_DESC= MIDI support
+NYQUIST_DESC= Nyquist synthesis and composition support
SBSMS_DESC= Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
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}"
+DEBUG_CMAKE_ON= wxWidgets_USE_DEBUG
-CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} \
- --disable-option-checking \
- --enable-unicode \
- --with-expat=system \
- --with-lib-preference="local" \
- --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}/include/lame/lame.h:audio/lame \
- ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
-DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
-# for audio/lame
-DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include
-# for audio/lame
-DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib
-
-FFMPEG_CONFIGURE_WITH= ffmpeg=system
+FFMPEG_CMAKE_ON= -Daudacity_use_ffmpeg:STRING=loaded
+FFMPEG_CMAKE_OFF= -Daudacity_use_ffmpeg:STRING=off
+FFMPEG_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-FLAC_CONFIGURE_WITH= libflac=system
+FLAC_CMAKE_ON= -Daudacity_use_flac:STRING=system
+FLAC_CMAKE_OFF= -Daudacity_use_flac:STRING=local
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
-ID3TAG_CONFIGURE_WITH= libid3tag=system
+ID3TAG_CMAKE_ON= -Daudacity_use_id3tag:STRING=system
+ID3TAG_CMAKE_OFF= -Daudacity_use_id3tag:STRING=off
ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag
-LADSPA_CONFIGURE_ENABLE= ladspa
-LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
+LADSPA_CMAKE_BOOL= audacity_use_ladspa
+LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
-LAME_CONFIGURE_ON= --with-lame=system
-# --without-lame is broken
-LAME_CONFIGURE_OFF= --with-lame
-LAME_CPPFLAGS= -I${LOCALBASE}/include
+LAME_CMAKE_ON= -Daudacity_use_lame:STRING=system
+LAME_CMAKE_OFF= -Daudacity_use_lame:STRING=local
+LAME_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
+LAME_CPPFLAGS= -I${LOCALBASE}/include/lame
LAME_LDFLAGS= -L${LOCALBASE}/lib
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
-LV2_CONFIGURE_WITH= lv2=system
+LV2_CMAKE_ON= -Daudacity_use_lv2:STRING=system
+LV2_CMAKE_OFF= -Daudacity_use_lv2:STRING=off
LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
+ libserd-0.so:devel/serd \
+ libsord-0.so:devel/sord \
+ libsratom-0.so:audio/sratom \
libsuil-0.so:audio/suil
-MAD_CONFIGURE_WITH= libmad=system
+MAD_CMAKE_ON= -Daudacity_use_mad:STRING=system
+MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off
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+
+MIDI_CMAKE_ON= -Daudacity_use_midi:STRING=local
+MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off
-SBSMS_CONFIGURE_WITH= sbsms
+# TODO: fix NLS support properly
+PLIST_SUB+= NLS=""
-SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system
-SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
+NYQUIST_CMAKE_ON= -Daudacity_use_nyquist:STRING=local
+NYQUIST_CMAKE_OFF= -Daudacity_use_nyquist:STRING=off
-SSE_CONFIGURE_ENABLE= sse
+OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system
+OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local
+OGG_LIB_DEPENDS= libogg.so:audio/libogg
-TWOLAME_CONFIGURE_WITH= libtwolame=system
+SBSMS_CMAKE_ON= -Daudacity_use_sbsms:STRING=local
+SBSMS_CMAKE_OFF= -Daudacity_use_sbsms:STRING=off
+
+SOUNDTOUCH_CMAKE_ON= -Daudacity_use_soundtouch:STRING=system
+SOUNDTOUCH_CMAKE_OFF= -Daudacity_use_soundtouch:STRING=off
+SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
+
+TWOLAME_CMAKE_ON= -Daudacity_use_twolame:STRING=system
+TWOLAME_CMAKE_OFF= -Daudacity_use_twolame:STRING=off
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
-VAMP_CONFIGURE_WITH= libvamp=system
+VAMP_CMAKE_ON= -Daudacity_use_vamp:STRING=system
+VAMP_CMAKE_OFF= -Daudacity_use_vamp:STRING=off
VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk
-VORBIS_CONFIGURE_WITH= libvorbis=system
+VORBIS_CMAKE_ON= -Daudacity_use_vorbis:STRING=system
+VORBIS_CMAKE_OFF= -Daudacity_use_vorbis:STRING=off
VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis
-VST_CONFIGURE_ENABLE= vst
+VST_CMAKE_BOOL= audacity_use_vst
+
+post-patch:
+ @${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
+ /CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
Modified: head/audio/audacity/distinfo
==============================================================================
--- head/audio/audacity/distinfo Tue Jun 16 11:58:44 2020 (r539343)
+++ head/audio/audacity/distinfo Tue Jun 16 12:14:27 2020 (r539344)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579914119
-SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7
-SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62073352
+TIMESTAMP = 1589881433
+SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
Added: head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt Tue Jun 16 12:14:27 2020 (r539344)
@@ -0,0 +1,11 @@
+--- cmake-proxies/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
++++ cmake-proxies/CMakeLists.txt
+@@ -150,7 +150,7 @@ addlib( lame lame LAME YES
+ addlib( lib-widget-extra libextra EXTRA YES YES "" )
+ addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
+ addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
+-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
++addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )
+
+ # Optional libraries
+ #
Added: head/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt Tue Jun 16 12:14:27 2020 (r539344)
@@ -0,0 +1,10 @@
+--- cmake-proxies/sbsms/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
++++ cmake-proxies/sbsms/CMakeLists.txt
+@@ -28,6 +28,7 @@ list( APPEND INCLUDES
+ list( APPEND OPTIONS
+ PRIVATE
+ $<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
++ ${SSE_FLAG}
+ )
+
+ find_package( Threads )
Modified: head/audio/audacity/pkg-plist
==============================================================================
--- head/audio/audacity/pkg-plist Tue Jun 16 11:58:44 2020 (r539343)
+++ head/audio/audacity/pkg-plist Tue Jun 16 12:14:27 2020 (r539344)
@@ -3,23 +3,15 @@ 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/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-dbg.lsp
%%DATADIR%%/nyquist/nyinit.lsp
%%DATADIR%%/nyquist/nyqmisc.lsp
%%DATADIR%%/nyquist/nyquist-plot.txt
@@ -46,11 +38,13 @@ share/applications/audacity.desktop
%%DATADIR%%/nyquist/seq.lsp
%%DATADIR%%/nyquist/seqfnint.lsp
%%DATADIR%%/nyquist/seqmidi.lsp
+%%DATADIR%%/nyquist/sliders.lsp
%%DATADIR%%/nyquist/sndfnint.lsp
+%%DATADIR%%/nyquist/spec-plot.lsp
+%%DATADIR%%/nyquist/spectral-analysis.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
@@ -66,10 +60,12 @@ share/applications/audacity.desktop
%%DATADIR%%/plug-ins/crossfadeclips.ny
%%DATADIR%%/plug-ins/crossfadetracks.ny
%%DATADIR%%/plug-ins/delay.ny
+%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
%%DATADIR%%/plug-ins/equalabel.ny
%%DATADIR%%/plug-ins/highpass.ny
%%DATADIR%%/plug-ins/limiter.ny
%%DATADIR%%/plug-ins/lowpass.ny
+%%DATADIR%%/plug-ins/noisegate.ny
%%DATADIR%%/plug-ins/notch.ny
%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny
%%DATADIR%%/plug-ins/pluck.ny
@@ -78,14 +74,15 @@ share/applications/audacity.desktop
%%DATADIR%%/plug-ins/rms.ny
%%DATADIR%%/plug-ins/sample-data-export.ny
%%DATADIR%%/plug-ins/sample-data-import.ny
+%%DATADIR%%/plug-ins/spectral-delete.ny
%%DATADIR%%/plug-ins/tremolo.ny
%%DATADIR%%/plug-ins/vocalrediso.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/16x16/audacity.png
+share/icons/hicolor/22x22/audacity.png
+share/icons/hicolor/24x24/audacity.png
+share/icons/hicolor/32x32/audacity.png
+share/icons/hicolor/48x48/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
More information about the svn-ports-all
mailing list