gnu: audacity: Update to 2.3.3.base-for-series-2615base-for-series-2614base-for-series-2612base-for-series-2610base-for-series-2609base-for-series-2606base-for-series-2605base-for-series-2603base-for-series-2602base-for-series-2601base-for-series-2598base-for-series-2595base-for-series-2592base-for-series-2591base-for-series-2576base-for-series-2570base-for-series-2567base-for-series-2566base-for-series-2565base-for-series-2563base-for-series-2560base-for-series-2558base-for-series-2556base-for-series-2551base-for-series-2548base-for-series-2546base-for-series-2539base-for-series-2537base-for-series-2533base-for-series-2532base-for-series-2529base-for-series-2528base-for-series-2527base-for-series-2525base-for-series-2524base-for-series-2522base-for-series-2513base-for-series-2511base-for-series-2508base-for-series-2504base-for-series-2503

* gnu/packages/audio.scm (audacity): Update to 2.3.3.
[source](snippet): Remove bundled "lame".
[arguments]: Adjust "use-upstream-headers" phase.
* gnu/packages/patches/audacity-build-with-system-portaudio.patch: Adjust patch.

2 files changed, 12 insertions, 13 deletions

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 9312dcc113..247a415307 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -332,7 +332,7 @@ engineers, musicians, soundtrack editors and composers.")
 (define-public audacity
   (package
     (name "audacity")
-    (version "2.3.2")
+    (version "2.3.3")
     (source
      (origin
        (method git-fetch)
@@ -342,7 +342,7 @@ engineers, musicians, soundtrack editors and composers.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "08w96124vv8k4myd4vifq73ningq6404x889wvg2sk016kc4dfv1"))
+         "0707fsnrl4vjalsi21w4blwgz024qhd0w8rdd5j5vpxf5lyk2rbk"))
        (patches (search-patches "audacity-build-with-system-portaudio.patch"))
        (modules '((guix build utils)))
        (snippet
@@ -351,7 +351,7 @@ engineers, musicians, soundtrack editors and composers.")
            (for-each
             (lambda (dir)
               (delete-file-recursively (string-append "lib-src/" dir)))
-            '("expat" "ffmpeg" "libflac" "libid3tag" "libmad" "libogg"
+            '("expat" "ffmpeg" "lame" "libflac" "libid3tag" "libmad" "libogg"
               "libsndfile" "libsoxr" "libvamp" "libvorbis" "lv2"
               "portaudio-v19" "portmidi" "soundtouch" "twolame"
               ;; FIXME: these libraries have not been packaged yet:
@@ -451,7 +451,8 @@ engineers, musicians, soundtrack editors and composers.")
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* '("src/NoteTrack.cpp"
                             "src/AudioIO.cpp"
-                            "src/AudioIO.h")
+                            "src/AudioIO.h"
+                            "src/AudioIOBase.cpp")
                (("../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")
                (("../lib-src/portmidi/porttime/porttime.h") "porttime.h"))
              (substitute* "src/prefs/MidiIOPrefs.cpp"
diff --git a/gnu/packages/patches/audacity-build-with-system-portaudio.patch b/gnu/packages/patches/audacity-build-with-system-portaudio.patch
index 3b73a6c930..05325a1493 100644
--- a/gnu/packages/patches/audacity-build-with-system-portaudio.patch
+++ b/gnu/packages/patches/audacity-build-with-system-portaudio.patch
@@ -1,6 +1,8 @@
 Downloaded from here:
 https://sourceforge.net/p/audacity/mailman/message/36106562/
 
+Modified for use on later versions of audacity.
+
 >From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
 From: Antonio Ospite <ao2@ao2.it>
 Date: Tue, 7 Nov 2017 13:06:33 +0100
@@ -31,16 +33,16 @@ over the code where it's used.
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
-index a78bd1cab..d5481838d 100644
+index 48715869c..bb4bf472c 100644
 --- a/src/AudioIO.cpp
 +++ b/src/AudioIO.cpp
-@@ -452,8 +452,23 @@ writing audio.
+@@ -480,9 +480,22 @@ time warp info and AudioIOListener and whether the playback is looped.
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
-    #include "../lib-src/portmidi/pm_common/portmidi.h"
+ //   #include "../lib-src/portmidi/pm_common/portmidi.h"
 -   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
     #include "NoteTrack.h"
-+
+ #endif
 +PaTime PaUtil_GetTime( void )
 +{
 +#ifdef HAVE_MACH_ABSOLUTE_TIME
@@ -55,10 +57,6 @@ index a78bd1cab..d5481838d 100644
 +    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
 +#endif
 +}
-+
- #endif
  
  #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
--- 
-2.15.0
-
+    #define LOWER_BOUND 0.0