diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index a860326b2886..ea72dd752093 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,149 +1,149 @@ # Created by: Marc van Woerkom <3d@FreeBSD.org> PORTNAME= audacity DISTVERSIONPREFIX= minsrc- -DISTVERSION= 3.0.0 +DISTVERSION= 3.0.2 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/ MAINTAINER= xxjack12xx@gmail.com COMMENT= GUI editor for digital audio waveforms LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libasound.so:audio/alsa-lib \ libexpat.so:textproc/expat2 \ libportaudio.so:audio/portaudio \ libsndfile.so:audio/libsndfile \ libsoxr.so:audio/libsoxr \ libsqlite3.so:databases/sqlite3 USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \ gnome libtool python:build pkgconfig shared-mime-info tar:xz USE_GNOME= cairo gtk30 USE_WX= 3.1+ WX_COMPS= wx INSTALLS_ICONS= yes PORTDOCS= README.txt 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 CMAKE_OFF= audacity_use_pch OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \ MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ VORBIS VST OPTIONS_DEFAULT= FLAC ID3TAG LV2 MAD MIDI OGG SBSMS \ SOUNDTOUCH TWOLAME VAMP VORBIS VST OPTIONS_EXCLUDE_i386= SBSMS 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= MIDI 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 DEBUG_CMAKE_ON= wxWidgets_USE_DEBUG DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \ docbook2man:textproc/docbook-utils 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_CMAKE_ON= -Daudacity_use_flac:STRING=system FLAC_CMAKE_OFF= -Daudacity_use_flac:STRING=local FLAC_LIB_DEPENDS= libFLAC.so:audio/flac ID3TAG_CMAKE_ON= -Daudacity_use_id3tag:STRING=system ID3TAG_CMAKE_OFF= -Daudacity_use_id3tag:STRING=off ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag LADSPA_CMAKE_BOOL= audacity_use_ladspa LADSPA_RUN_DEPENDS= listplugins:audio/ladspa 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_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_CMAKE_ON= -Daudacity_use_mad:STRING=system MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off MAD_LIB_DEPENDS= libmad.so:audio/libmad MIDI_CMAKE_ON= -Daudacity_use_midi:STRING=local MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off # TODO: fix NLS support properly PLIST_SUB+= NLS="" OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local OGG_LIB_DEPENDS= libogg.so:audio/libogg 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_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_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_CMAKE_BOOL= audacity_use_vst .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DHAVE_MMX:BOOL=OFF \ -DHAVE_SSE:BOOL=OFF \ -DHAVE_SSE2:BOOL=OFF .endif post-install: @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ bin/${PORTNAME} \ share/audacity/modules/mod-script-pipe.so @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt # delete empty directories: https://github.com/audacity/audacity/issues/808 @${FIND} ${STAGEDIR} -type d -empty -delete post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index 4b53733c5ba4..3442dbc6b929 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616886054 -SHA256 (audacity-minsrc-3.0.0.tar.xz) = d3bb1358b930ea4ef935ed83cc5a0f47006565762c5667c2fb376c6535876a6a -SIZE (audacity-minsrc-3.0.0.tar.xz) = 13308836 +TIMESTAMP = 1619066304 +SHA256 (audacity-minsrc-3.0.2.tar.xz) = 728d6459931da006ed45a31e63b7fe6ca47a2547459a2aff3bf0880cef85c296 +SIZE (audacity-minsrc-3.0.2.tar.xz) = 13330160 diff --git a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c b/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c deleted file mode 100644 index 4bb6881c486d..000000000000 --- a/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig 2021-02-04 18:52:51 UTC -+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c -@@ -19,8 +19,7 @@ - /* do some sanity checking: */ - #ifndef XL_BIG_ENDIAN - #ifndef XL_LITTLE_ENDIAN --#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined --in xlisp.h -+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h - #endif - #endif - #ifdef XL_BIG_ENDIAN diff --git a/audio/audacity/files/patch-src_ProjectSerializer.cpp b/audio/audacity/files/patch-src_ProjectSerializer.cpp deleted file mode 100644 index 3e43594c4a59..000000000000 --- a/audio/audacity/files/patch-src_ProjectSerializer.cpp +++ /dev/null @@ -1,60 +0,0 @@ ---- src/ProjectSerializer.cpp.orig 2021-02-04 18:52:51 UTC -+++ src/ProjectSerializer.cpp -@@ -206,9 +206,9 @@ ProjectSerializer::ProjectSerializer(size_t allocSize) - std::call_once(flag, []{ - // Just once per run, store header information in the unique static - // dictionary that will be written into each project that is saved. -- // Store the size of "wxChar" so we can convert during recovery in -- // case the file is used on a system with a different character size. -- char size = sizeof(wxChar); -+ // Store the size of "wxStringCharType" so we can convert during recovery -+ // in case the file is used on a system with a different character size. -+ char size = sizeof(wxStringCharType); - mDict.AppendByte(FT_CharSize); - mDict.AppendData(&size, 1); - }); -@@ -242,7 +242,7 @@ void ProjectSerializer::WriteAttr(const wxString & nam - mBuffer.AppendByte(FT_String); - WriteName(name); - -- const Length len = value.length() * sizeof(wxChar); -+ const Length len = value.length() * sizeof(wxStringCharType); - WriteLength( mBuffer, len ); - mBuffer.AppendData(value.wx_str(), len); - } -@@ -309,7 +309,7 @@ void ProjectSerializer::WriteData(const wxString & val - { - mBuffer.AppendByte(FT_Data); - -- Length len = value.length() * sizeof(wxChar); -+ Length len = value.length() * sizeof(wxStringCharType); - WriteLength( mBuffer, len ); - mBuffer.AppendData(value.wx_str(), len); - } -@@ -317,7 +317,7 @@ void ProjectSerializer::WriteData(const wxString & val - void ProjectSerializer::Write(const wxString & value) - { - mBuffer.AppendByte(FT_Raw); -- Length len = value.length() * sizeof(wxChar); -+ Length len = value.length() * sizeof(wxStringCharType); - WriteLength( mBuffer, len ); - mBuffer.AppendData(value.wx_str(), len); - } -@@ -334,7 +334,7 @@ void ProjectSerializer::WriteSubTree(const ProjectSeri - - void ProjectSerializer::WriteName(const wxString & name) - { -- wxASSERT(name.length() * sizeof(wxChar) <= SHRT_MAX); -+ wxASSERT(name.length() * sizeof(wxStringCharType) <= SHRT_MAX); - UShort id; - - auto nameiter = mNames.find(name); -@@ -346,7 +346,7 @@ void ProjectSerializer::WriteName(const wxString & nam - { - // mNames is static. This appends each name to static mDict only once - // in each run. -- UShort len = name.length() * sizeof(wxChar); -+ UShort len = name.length() * sizeof(wxStringCharType); - - id = mNames.size(); - mNames[name] = id; diff --git a/audio/audacity/files/patch-src_import_Import.cpp b/audio/audacity/files/patch-src_import_Import.cpp deleted file mode 100644 index 5e43033c33ee..000000000000 --- a/audio/audacity/files/patch-src_import_Import.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/import/Import.cpp.orig 2021-02-04 18:52:51 UTC -+++ src/import/Import.cpp -@@ -803,9 +803,11 @@ bool Importer::Import( AudacityProject &project, - /* i18n-hint: %s will be the filename */ - "Audacity did not recognize the type of the file '%s'.\n\n%sFor uncompressed files, also try File > Import > Raw Data.") - .Format( fName, -+#if defined(USE_FFMPEG) - !FFmpegLibsInst() -- ? XO("Try installing FFmpeg.\n\n") -- : XO("") ); -+ ? XO("Try installing FFmpeg.\n\n") : -+#endif -+ Verbatim("") ); - } - else - { diff --git a/audio/audacity/files/patch-src_widgets_FileConfig.cpp b/audio/audacity/files/patch-src_widgets_FileConfig.cpp deleted file mode 100644 index dbad602eaca0..000000000000 --- a/audio/audacity/files/patch-src_widgets_FileConfig.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/widgets/FileConfig.cpp.orig 2021-02-04 18:52:51 UTC -+++ src/widgets/FileConfig.cpp -@@ -10,6 +10,8 @@ - - #include "../Audacity.h" - -+#include -+ - #include - #include - #include