Attachment 204367 Details for Bug 237891 – Patch to upgrade audacity to 2.3.2

Patch to upgrade audacity to 2.3.2

audacity.txt (text/plain), 5.39 KB, created by Jack on 2019-05-14 02:08:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2019-05-14 02:08:52 UTC

Size: 5.39 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2019-05-13 18:20:43.324902000 -0700
>+++ audacity-new/Makefile	2019-05-13 18:17:17.419960000 -0700
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/audio/audacity/Makefile 495224 2019-03-10 04:29:40Z tobik $
> 
> PORTNAME=	audacity
>-PORTVERSION=	2.3.1
>+PORTVERSION=	2.3.2
> DISTVERSIONPREFIX=	Audacity-
> CATEGORIES=	audio
> 
>diff -urN audacity/distinfo audacity-new/distinfo
>--- audacity/distinfo	2019-05-13 18:20:43.344677000 -0700
>+++ audacity-new/distinfo	2019-05-13 18:17:17.420053000 -0700
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1552123965
>-SHA256 (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 2ef1c06f9cdc2ee3d315b8e575dc2bea5b372f4f415f3dc6570c3cfca0f93321
>-SIZE (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 27618480
>+TIMESTAMP = 1557793254
>+SHA256 (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = cc477a71ff5571c72887a7a155365b07a1a50bcea1abf490a4de7b884376c731
>+SIZE (audacity-audacity-Audacity-2.3.2_GH0.tar.gz) = 61972597
>diff -urN audacity/files/patch-include_audacity_Types.h audacity-new/files/patch-include_audacity_Types.h
>--- audacity/files/patch-include_audacity_Types.h	2019-05-13 18:20:43.435219000 -0700
>+++ audacity-new/files/patch-include_audacity_Types.h	2019-05-13 18:17:17.420745000 -0700
>@@ -1,6 +1,6 @@
> --- include/audacity/Types.h.orig	2018-10-01 14:07:33 UTC
> +++ include/audacity/Types.h
>-@@ -73,7 +73,7 @@ class sampleCount (public)
>+@@ -100,7 +100,7 @@ class sampleCount (public)
>     sampleCount ( long v ) : value { v } {}
>  
>     // unsigned long is 64 bit on some platforms.  Let it narrow.
>diff -urN audacity/files/patch-lib-src_FileDialog_configure.ac audacity-new/files/patch-lib-src_FileDialog_configure.ac
>--- audacity/files/patch-lib-src_FileDialog_configure.ac	2019-05-13 18:20:43.476524000 -0700
>+++ audacity-new/files/patch-lib-src_FileDialog_configure.ac	2019-05-13 18:17:17.421268000 -0700
>@@ -1,6 +1,6 @@
> --- lib-src/FileDialog/configure.ac.orig	2018-09-20 14:35:07 UTC
> +++ lib-src/FileDialog/configure.ac
>-@@ -124,7 +124,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
>+@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
>  
>  echo "Implementation to use: $IMPLEMENTATION"
>  
>diff -urN audacity/files/patch-src_AudioIO.cpp audacity-new/files/patch-src_AudioIO.cpp
>--- audacity/files/patch-src_AudioIO.cpp	2019-05-13 18:20:43.444376000 -0700
>+++ audacity-new/files/patch-src_AudioIO.cpp	2019-05-13 18:17:17.420827000 -0700
>@@ -1,6 +1,6 @@
> --- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
> +++ src/AudioIO.cpp
>-@@ -467,7 +467,6 @@ TimeTrack and AudioIOListener and whether the playback
>+@@ -479,7 +479,6 @@ TimeTrack and AudioIOListener and whether the playback
>     #define ROUND(x) (int) ((x)+0.5)
>     //#include <string.h>
>     #include "../lib-src/portmidi/pm_common/portmidi.h"
>@@ -8,7 +8,7 @@
>     #include "NoteTrack.h"
>  #endif
>  
>-@@ -787,13 +786,22 @@ struct AudioIO::ScrubState (private)
>+@@ -799,13 +800,22 @@ struct AudioIO::ScrubState (private)
>  // return the system time as a double
>  static double streamStartTime = 0; // bias system time to small number
>  
>diff -urN audacity/files/patch-src_FFmpeg.h audacity-new/files/patch-src_FFmpeg.h
>--- audacity/files/patch-src_FFmpeg.h	2019-05-13 18:20:43.483627000 -0700
>+++ audacity-new/files/patch-src_FFmpeg.h	2019-05-13 18:17:17.421439000 -0700
>@@ -1,6 +1,6 @@
> --- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
> +++ src/FFmpeg.h
>-@@ -705,7 +705,7 @@ extern "C" {
>+@@ -671,7 +671,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        AVOutputFormat*,
>        av_oformat_next,
>@@ -9,7 +9,7 @@
>        (f)
>     );
>  #endif
>-@@ -786,7 +786,7 @@ extern "C" {
>+@@ -752,7 +752,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        int,
>        av_fifo_size,
>@@ -18,7 +18,7 @@
>        (f)
>     );
>  #endif
>-@@ -848,7 +848,7 @@ extern "C" {
>+@@ -814,7 +814,7 @@ extern "C" {
>     FFMPEG_FUNCTION_WITH_RETURN(
>        AVDictionaryEntry *,
>        av_dict_get,
>diff -urN audacity/files/patch-src_MemoryX.h audacity-new/files/patch-src_MemoryX.h
>--- audacity/files/patch-src_MemoryX.h	2019-05-13 18:20:43.470955000 -0700
>+++ audacity-new/files/patch-src_MemoryX.h	2019-05-13 18:17:17.421180000 -0700
>@@ -1,6 +1,6 @@
> --- src/MemoryX.h.orig	2019-03-09 11:55:09 UTC
> +++ src/MemoryX.h
>-@@ -628,7 +628,7 @@ make_iterator_range( const Container &container )
>+@@ -641,7 +641,7 @@ make_iterator_range( const Container &container )
>  // For using std::unordered_map on wxString
>  namespace std
>  {
>diff -urN audacity/files/patch-src_prefs_PrefsDialog.cpp audacity-new/files/patch-src_prefs_PrefsDialog.cpp
>--- audacity/files/patch-src_prefs_PrefsDialog.cpp	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-src_prefs_PrefsDialog.cpp	2019-05-13 18:17:17.421867000 -0700
>@@ -0,0 +1,10 @@
>+--- src/prefs/PrefsDialog.cpp.orig	2019-05-13 18:00:33.704997000 -0700
>++++ src/prefs/PrefsDialog.cpp	2019-05-13 17:52:51.702814000 -0700
>+@@ -29,6 +29,7 @@
>+ #include <wx/intl.h>
>+ #include <wx/listbox.h>
>+ #include <wx/sizer.h>
>++#include <wx/treectrl.h>
>+ 
>+ #include <wx/listbook.h>
>+ 
>diff -urN audacity/pkg-plist audacity-new/pkg-plist
>--- audacity/pkg-plist	2019-05-13 18:20:43.498260000 -0700
>+++ audacity-new/pkg-plist	2019-05-13 18:17:17.419857000 -0700
>@@ -71,6 +71,7 @@
> %%DATADIR%%/plug-ins/limiter.ny
> %%DATADIR%%/plug-ins/lowpass.ny
> %%DATADIR%%/plug-ins/notch.ny
>+%%DATADIR%%/plug-ins/nyquist-plug-in-installer.ny
> %%DATADIR%%/plug-ins/pluck.ny
> %%DATADIR%%/plug-ins/rhythmtrack.ny
> %%DATADIR%%/plug-ins/rissetdrum.ny

Flags:

xxjack12xx: maintainer-approval+

Actions: View

Attachments on bug 237891: 204367