Enclosed diff brings audacity to 2.3.3, which focuses on bug fixes and code restructuring. Additional information on this release can be found in the release announcement [0].
Run tested on amd64. More precise, I have been using this update for a couple of days. So far, no regression. Comments/OK? [0] https://github.com/audacity/audacity/releases/tag/Audacity-2.3.3 diff --git Makefile Makefile index e396d07d11c..51dad91c94c 100644 --- Makefile +++ Makefile @@ -6,9 +6,8 @@ COMMENT= free audio editor # so can't be fetched automatically GH_ACCOUNT= audacity GH_PROJECT= audacity -GH_TAGNAME= Audacity-2.3.2 +GH_TAGNAME= Audacity-2.3.3 DISTNAME= ${GH_TAGNAME:L} -REVISION= 1 CATEGORIES= audio HOMEPAGE= https://www.audacityteam.org/ diff --git distinfo distinfo index 31e7b242cb0..67bf53ba677 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (audacity-2.3.2.tar.gz) = zEd6cf9Vcccoh6ehVTZbB6GlC86hq/SQpN57iEN2xzE= -SIZE (audacity-2.3.2.tar.gz) = 61972597 +SHA256 (audacity-2.3.3.tar.gz) = QE5sSWk97clCEvxVJZdAWNhIU2Al4Z2jE1muArq+i9c= +SIZE (audacity-2.3.3.tar.gz) = 62073352 diff --git patches/patch-configure_ac patches/patch-configure_ac index d4356305ae5..c466434334a 100644 --- patches/patch-configure_ac +++ patches/patch-configure_ac @@ -6,7 +6,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2019/06/12 20:28:36 rapha Exp $ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -204,12 +204,16 @@ if test x$enable_universal_binary = xyes; then +@@ -200,12 +200,16 @@ if test x$enable_universal_binary = xyes; then esac fi @@ -29,7 +29,7 @@ Index: configure.ac fi if test x$enable_sse = xyes; then -@@ -650,10 +654,6 @@ case "${host_os}" in +@@ -646,10 +650,6 @@ case "${host_os}" in AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) if [[ $have_alsa = "yes" ]] ; then LIBS="$LIBS -lasound" diff --git patches/patch-lib-src_FileDialog_Makefile_am patches/patch-lib-src_FileDialog_Makefile_am index 1df0fbbc809..ec192221959 100644 --- patches/patch-lib-src_FileDialog_Makefile_am +++ patches/patch-lib-src_FileDialog_Makefile_am @@ -5,7 +5,8 @@ $OpenBSD: patch-lib-src_FileDialog_Makefile_am,v 1.1 2019/03/26 18:26:45 rapha E Index: lib-src/FileDialog/Makefile.am --- lib-src/FileDialog/Makefile.am.orig +++ lib-src/FileDialog/Makefile.am -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + AM_LIBTOOLFLAGS = --tag CC ACLOCAL_AMFLAGS = -I m4 -lib_LTLIBRARIES = libFileDialog.la diff --git patches/patch-src_AudacityApp_cpp patches/patch-src_AudacityApp_cpp index 4e61dcf65f6..5f5328b6605 100644 --- patches/patch-src_AudacityApp_cpp +++ patches/patch-src_AudacityApp_cpp @@ -5,7 +5,7 @@ Don't hardcode shared libraries version number. Index: src/AudacityApp.cpp --- src/AudacityApp.cpp.orig +++ src/AudacityApp.cpp -@@ -540,12 +540,12 @@ class GnomeShutdown +@@ -642,12 +642,12 @@ class GnomeShutdown { mArgv[0].reset(strdup("Audacity")); diff --git patches/patch-src_AudioIO_cpp patches/patch-src_AudioIO_cpp index 5d078224adc..85a534c1f28 100644 --- patches/patch-src_AudioIO_cpp +++ patches/patch-src_AudioIO_cpp @@ -6,7 +6,7 @@ $OpenBSD: patch-src_AudioIO_cpp,v 1.10 2019/09/26 13:54:54 sthen Exp $ Index: src/AudioIO.cpp --- src/AudioIO.cpp.orig +++ src/AudioIO.cpp -@@ -802,18 +802,15 @@ static double streamStartTime = 0; // bias system time +@@ -797,18 +797,15 @@ static double streamStartTime = 0; // bias system time static double SystemTime(bool usingAlsa) { #ifdef __WXGTK__ @@ -27,12 +27,12 @@ Index: src/AudioIO.cpp } #endif -@@ -4738,7 +4735,7 @@ void AudioIoCallback::ComputeMidiTimings( +@@ -3606,7 +3603,7 @@ void AudioIoCallback::ComputeMidiTimings( } /* GSW: Save timeInfo in case MidiPlayback needs it */ - mAudioCallbackClockTime = PaUtil_GetTime(); -+ mAudioCallbackClockTime = SystemTime(gAudioIO->mUsingAlsa); ++ mAudioCallbackClockTime = SystemTime(mUsingAlsa); /* for Linux, estimate a smooth audio time as a slowly-changing offset from system time */ diff --git patches/patch-src_MemoryX_h patches/patch-src_MemoryX_h deleted file mode 100644 index 7fbd8a0874c..00000000000 --- patches/patch-src_MemoryX_h +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_MemoryX_h,v 1.4 2019/09/26 13:54:54 sthen Exp $ - -Index: src/MemoryX.h ---- src/MemoryX.h.orig -+++ src/MemoryX.h -@@ -641,7 +641,6 @@ make_iterator_range( const Container &container ) - // For using std::unordered_map on wxString - namespace std - { -- template<typename T> struct hash; - template<> struct hash< wxString > { - size_t operator () (const wxString &str) const // noexcept - { diff --git pkg/PLIST pkg/PLIST index 6978510d226..82298e79ae8 100644 --- pkg/PLIST +++ pkg/PLIST @@ -88,7 +88,6 @@ share/audacity/plug-ins/sample-data-export.ny share/audacity/plug-ins/sample-data-import.ny share/audacity/plug-ins/tremolo.ny share/audacity/plug-ins/vocalrediso.ny -share/audacity/plug-ins/vocalremover.ny share/audacity/plug-ins/vocoder.ny share/doc/audacity/ share/doc/audacity/LICENSE.txt
