From owner-svn-ports-all@freebsd.org Fri Jul 3 02:58:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A88EB366BF5; Fri, 3 Jul 2020 02:58:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49yfmp44Yvz4b7N; Fri, 3 Jul 2020 02:58:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F307245F3; Fri, 3 Jul 2020 02:58:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0632wour003031; Fri, 3 Jul 2020 02:58:50 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0632wmHn003022; Fri, 3 Jul 2020 02:58:48 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202007030258.0632wmHn003022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 3 Jul 2020 02:58:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541065 - in head/audio/audacity: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/audio/audacity: . files X-SVN-Commit-Revision: 541065 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2020 02:58:50 -0000 Author: tobik Date: Fri Jul 3 02:58:48 2020 New Revision: 541065 URL: https://svnweb.freebsd.org/changeset/ports/541065 Log: audio/audacity: Update to 2.4.2 - This should fix hangs on startup on FreeBSD 11.4 - Remove NYQUIST option since it is mandatory and disabling it does not work Changes: https://www.audacityteam.org/audacity-2-4-2-released/ PR: 247604 Submitted by: maintainer Added: head/audio/audacity/files/patch-src_AboutDialog.cpp (contents, props changed) Deleted: head/audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt Modified: head/audio/audacity/Makefile head/audio/audacity/distinfo head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h head/audio/audacity/files/patch-src_AudioIO.cpp head/audio/audacity/files/patch-src_FFmpeg.h head/audio/audacity/pkg-plist Modified: head/audio/audacity/Makefile ============================================================================== --- head/audio/audacity/Makefile Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/Makefile Fri Jul 3 02:58:48 2020 (r541065) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= audacity -PORTVERSION= 2.4.1 +PORTVERSION= 2.4.2 DISTVERSIONPREFIX= Audacity- CATEGORIES= audio @@ -35,18 +35,19 @@ CMAKE_ARGS= -Daudacity_lib_preference: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 NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ + MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ VORBIS VST -OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \ +OPTIONS_DEFAULT= FLAC ID3TAG LADSPA 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 -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 @@ -98,9 +99,6 @@ MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off # TODO: fix NLS support properly PLIST_SUB+= NLS="" - -NYQUIST_CMAKE_ON= -Daudacity_use_nyquist:STRING=local -NYQUIST_CMAKE_OFF= -Daudacity_use_nyquist:STRING=off OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local Modified: head/audio/audacity/distinfo ============================================================================== --- head/audio/audacity/distinfo Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/distinfo Fri Jul 3 02:58:48 2020 (r541065) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589881433 -SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f -SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461 +TIMESTAMP = 1593304211 +SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099 +SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430 Modified: head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt ============================================================================== --- head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt Fri Jul 3 02:58:48 2020 (r541065) @@ -1,7 +1,7 @@ ---- cmake-proxies/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC +--- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC +++ cmake-proxies/CMakeLists.txt -@@ -150,7 +150,7 @@ addlib( lame lame LAME YES - addlib( lib-widget-extra libextra EXTRA YES YES "" ) +@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES + addlib( lame lame LAME YES YES "lame >= 3.100" ) 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 "" ) Modified: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h ============================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h Fri Jul 3 02:58:48 2020 (r541065) @@ -1,6 +1,6 @@ --- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC +++ lib-src/libnyquist/nyquist/cmt/cext.h -@@ -58,7 +58,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca +@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca #include #endif Modified: head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h ============================================================================== --- head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h Fri Jul 3 02:58:48 2020 (r541065) @@ -1,6 +1,6 @@ --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h -@@ -160,6 +160,15 @@ extern long ptrtoabs(); +@@ -161,6 +161,15 @@ extern long ptrtoabs(); #endif #endif Added: head/audio/audacity/files/patch-src_AboutDialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/audacity/files/patch-src_AboutDialog.cpp Fri Jul 3 02:58:48 2020 (r541065) @@ -0,0 +1,11 @@ +--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC ++++ src/AboutDialog.cpp +@@ -63,7 +63,7 @@ hold information about one contributor to Audacity. + // RevisionIdent.h may contain #defines like these ones: + //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e" + //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100" +-#include ++//#include + + #ifndef REV_TIME + #define REV_TIME "unknown date and time" Modified: head/audio/audacity/files/patch-src_AudioIO.cpp ============================================================================== --- head/audio/audacity/files/patch-src_AudioIO.cpp Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/files/patch-src_AudioIO.cpp Fri Jul 3 02:58:48 2020 (r541065) @@ -1,6 +1,6 @@ ---- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC +--- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC +++ src/AudioIO.cpp -@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback +@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla #define ROUND(x) (int) ((x)+0.5) //#include // #include "../lib-src/portmidi/pm_common/portmidi.h" @@ -8,7 +8,7 @@ #include "NoteTrack.h" #endif -@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private) +@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private) // return the system time as a double static double streamStartTime = 0; // bias system time to small number Modified: head/audio/audacity/files/patch-src_FFmpeg.h ============================================================================== --- head/audio/audacity/files/patch-src_FFmpeg.h Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/files/patch-src_FFmpeg.h Fri Jul 3 02:58:48 2020 (r541065) @@ -1,6 +1,6 @@ --- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC +++ src/FFmpeg.h -@@ -667,7 +667,7 @@ extern "C" { +@@ -685,7 +685,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( AVOutputFormat*, av_oformat_next, @@ -9,7 +9,7 @@ (f) ); #endif -@@ -748,7 +748,7 @@ extern "C" { +@@ -766,7 +766,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( int, av_fifo_size, @@ -18,7 +18,7 @@ (f) ); #endif -@@ -810,7 +810,7 @@ extern "C" { +@@ -828,7 +828,7 @@ extern "C" { FFMPEG_FUNCTION_WITH_RETURN( AVDictionaryEntry *, av_dict_get, Modified: head/audio/audacity/pkg-plist ============================================================================== --- head/audio/audacity/pkg-plist Fri Jul 3 01:14:51 2020 (r541064) +++ head/audio/audacity/pkg-plist Fri Jul 3 02:58:48 2020 (r541065) @@ -3,6 +3,7 @@ man/man1/audacity.1.gz share/appdata/audacity.appdata.xml share/applications/audacity.desktop %%DATADIR%%/EQDefaultCurves.xml +%%DATADIR%%/modules/mod-script-pipe.so %%DATADIR%%/nyquist/aud-do-support.lsp %%DATADIR%%/nyquist/dspprims.lsp %%DATADIR%%/nyquist/envelopes.lsp