Merge branch 'master' into emacs-team

1 files changed, 174 insertions, 10 deletions

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 8681bb1c10..cf74a2cd36 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2270,7 +2270,7 @@ a JACK session.")
 (define-public mixxx
   (package
     (name "mixxx")
-    (version "2.3.5")
+    (version "2.3.6")
     (source
      (origin
        (method git-fetch)
@@ -2282,7 +2282,7 @@ a JACK session.")
         (search-patches "mixxx-link-qtscriptbytearray-qtscript.patch"
                         "mixxx-system-googletest-benchmark.patch"))
        (sha256
-        (base32 "0142xcq5ahk50kzc06s13xilj8m4p0spmd5hqd8s08qjhr37n2il"))
+        (base32 "1v1sza75rf2q1m0bdc0j2k53qd34m12d1573jmac3g7vvyqh5n2m"))
        (modules '((guix build utils)))
        (snippet
         ;; Delete libraries that we already have or don't need.
@@ -3780,15 +3780,15 @@ event-based scripts for scrobbling, notifications, etc.")
 (define-public picard
   (package
     (name "picard")
-    (version "2.9")
+    (version "2.9.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "https://musicbrainz.osuosl.org/pub/musicbrainz/"
+                    "https://data.musicbrainz.org/pub/musicbrainz/"
                     "picard/picard-" version ".tar.gz"))
               (sha256
                (base32
-                "0afiziaq49sq1dx5r3qis4ymhhkrqlrkfnb6f7gcksj0kwljvsw9"))))
+                "1f1nf53xm94jam8w86a8hx69ilzddjibf29c7f1i353fr6k6bqvs"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -3806,12 +3806,10 @@ event-based scripts for scrobbling, notifications, etc.")
                  (string-append
                   "pyfpcalc', '"
                   (assoc-ref inputs "chromaprint") "/bin/fpcalc")))))
-          (add-before 'check 'delete-failing-test
+          ;; pipe tests require writable $HOME.
+          (add-before 'check 'set-HOME
             (lambda _
-              ;; FIXME: This test fails in build environment.
-              ;; util/pipe.read_from_pipe:244: pipe reader exception:
-              ;; ERROR: Pipe doesn't exist
-              (delete-file "test/test_util_pipe.py"))))))
+              (setenv "HOME" "/tmp"))))))
     (native-inputs
      (list gettext-minimal python-dateutil))
     (inputs
@@ -6352,6 +6350,170 @@ keymaps for QWERTZ, QWERTY and AZERTY keyboards and also allows custom
 ones.")
    (license license:bsd-0)))
 
+(define-public distrho-ports
+  ;; From 2021-03-15 to this commit various important changes are made
+  ;; including improved directory structure and updated JUCE versions.
+  (let ((commit "f2dbaded0a05732e3499fa374a586e5b32370da5")
+        (revision "0"))
+    (package
+      (name "distrho-ports")
+      (version (git-version "2021-03-15" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/DISTRHO/DISTRHO-Ports")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1rrnqwask2qg05ynisk6bpj118cl7c3w53rqrfg5x3sx847rjjgc"))
+                (modules '((guix build utils)))
+                (snippet
+                 '(begin
+                    ;; Delete third party libraries, libraries without
+                    ;; licenses, and unneeded libraries.
+                    (for-each
+                     delete-file-recursively
+                     (list "ports-juce5/arctican-function"         ;no license
+                           "ports-juce5/arctican-pilgrim"          ;no license
+                           "ports-juce5/drowaudio-tremolo"         ;no license
+                           "ports-juce5/juce-demo-host"            ;not used
+                           "ports-juce5/juce-demo-plugin"          ;not used
+                           "ports-juce5/temper/source/faust"       ;bundled
+                           "ports-juce6/chow"                      ;not used
+                           "ports-juce6/swankyamp/thirdparty"      ;bundled
+                           "ports-juce6/vitalium/third_party"))    ;bundled
+                    ;; Exclude them from building.
+                    (substitute* (find-files "." "meson.build$")
+                      (("'arctican") "#'arctican")
+                      (("'drowaudio-tremolo") "#'drowaudio-tremolo")
+                      (("'third") "#'third"))
+                    ;; Use system provided "nlohmann/json.hpp".
+                    (with-directory-excursion "ports-juce6/vitalium/source"
+                      (substitute*
+                          (list "common/line_generator.h"
+                                "common/load_save.h"
+                                "common/tuning.h"
+                                "common/wavetable/wavetable_component.h"
+                                "common/wavetable/wavetable_creator.h"
+                                "common/wavetable/wavetable_keyframe.h"
+                                "interface/editor_sections/save_section.h"
+                                "interface/look_and_feel/skin.h"
+                                "synthesis/producers/sample_source.h")
+                        (("json/json\\.h") "nlohmann/json.hpp")))))))
+      (build-system meson-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no test target
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-juce-fonts
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((fonts (search-input-directory inputs "/etc/fonts")))
+                  (with-directory-excursion "libs"
+                    (substitute* (find-files "." "juce_linux_Fonts.cpp$")
+                      (("/usr/share/fonts") fonts)))))))))
+      (native-inputs
+       (list cmake-minimal
+             concurrentqueue
+             faust
+             nlohmann-json
+             optional-lite
+             pkg-config))
+      (inputs
+       (list alsa-lib
+             fontconfig
+             freetype
+             fftwf
+             libx11
+             libxcursor
+             libxext
+             libxrender
+             mesa))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "LV2_PATH")
+              (files '("lib/lv2")))
+             (search-path-specification
+              (variable "VST2_PATH")
+              (files '("lib/vst")))
+             (search-path-specification
+              (variable "VST3_PATH")
+              (files '("lib/vst3")))))
+      (home-page "https://github.com/DISTRHO/DISTRHO-Ports")
+      (synopsis "Audio plugins and LV2 ports")
+      (description
+       "This package contains LV2 ports of the following audio plugins:
+@itemize
+@item Dexed,
+@item dRowAudio plugins (Distortion, Distortion Shaper, Flanger, Reverb,
+  Tremolo),
+@item DrumSynth,
+@item EasySSP,
+@item EQinox,
+@item HiReSam,
+@item JuceOPL,
+@item KlangFalter,
+@item LUFS Meter,
+@item Luftikus,
+@item Obxd,
+@item PitchedDelay,
+@item ReFine,
+@item StereoSourceSeperation,
+@item Swanky Amp,
+@item TAL plugins (Dub-3, Filter, Filter-2, Noize Mak3r, Reverb, Reverb-II,
+  Reverb-III, Vocoder-II),
+@item Temper,
+@item Vex,
+@item Vitalium, and
+@item Wolpertinger.
+@end itemize")
+      (license
+       (list license:asl2.0             ;used by Dexed
+             ;; mingw-std-threads and EasySSP (for dsp-utility) use FreeBSD.
+             license:bsd-2
+             ;; Licenses for dRowAudio is not found in this repository, but
+             ;; the upstream project is licensed under MIT:
+             ;; https://github.com/drowaudio/drowaudio.
+             ;; Luftikus, PitchedDelay and ReFine are ported from lkjb plugins
+             ;; which is licensed under MIT:
+             ;; https://github.com/lkjbdsp/lkjb-plugins.
+             license:expat
+             (license:fsf-free          ;used by Temper
+              "file:///ports-juce5/temper/source/TemperDsp.hpp")
+             ;; juce-plugin, LUFS Meter, Obxd and TAL plugins use GPLv2.
+             license:gpl2
+             ;; License for Wolpertinger is not found in this repository, but
+             ;; the upstream project is licensed under GPLv2+:
+             ;; https://github.com/jkroll20/wolpertinger.
+             ;; dRowAudio plugins, juced, HiReSam and Vex use this license.
+             ;; Packages using files from JUCETICE project use this license.
+             license:gpl2+
+             ;; License for EasySSP is not found in this repository, but the
+             ;; upstream project is licensed under GPLv3:
+             ;; https://github.com/automatl/audio-dsp-multi-visualize.
+             license:gpl3               ;used by JUCE
+             ;; Dexed, Swanky Amp, Vitalium and KlangFalter use GPLv3+.
+             license:gpl3+
+             ;; License for lv2-ttl-generator is not found in this repository,
+             ;; but is a part of DPF-Plugins and is licensed under ISC:
+             ;; https://github.com/DISTRHO/DPF.
+             ;; JUCE uses this license for juce_audio_basics,
+             ;; juce_audio_devices, juce_blocks_basics, juce_core and
+             ;; juce_events.
+             license:isc
+             license:lgpl2.0+           ;used by DrumSynth and EQinox
+             license:lgpl2.1+           ;used by SoundTouch and juce-opl
+             ;; StereoSourceSeperation uses a non-copyleft license.
+             (license:non-copyleft
+              "file:///ports-juce5/stereosourceseparation/\
+source/kiss_fft/kiss_fft.c")
+             ;; dRowAudio uses a non-copyleft license for curl.
+             (license:non-copyleft
+              "file:///libs/drowaudio/source/dRowAudio/network/\
+curl/include/curl/curl.h")
+             license:wtfpl2))))) ;used by dRowAudio for FFTReal
+
 (define-public dpf-plugins
   (package
     (name "dpf-plugins")
@@ -6517,6 +6679,7 @@ and as an LV2 plugin.")
                    "-Dgraphviz=enabled" ;for exporting routing graphs
                    "-Dguile=enabled"    ;for Guile scripting
                    "-Djack=enabled"     ;for JACK audio/MIDI backend
+                   "-Drtaudio=enabled"  ;for RtAudio backend (ALSA)
                    "-Drtmidi=enabled"   ;for RtMidi backend (ALSA sequencer)
                    "-Dsdl=enabled")     ;for SDL audio backend (which uses ALSA)
            #:phases
@@ -6598,6 +6761,7 @@ success = io_mkdir (tmp_log_dir, &err);")))
            pipewire
            pulseaudio
            reproc
+           rtaudio
            rtmidi
            rubberband
            sdl2