[bug#74723] [PATCH 00/19] gnu: lmms, carla: New features, fixes and updates.

[bug#74723] [PATCH 00/19] gnu: lmms, carla: New features, fixes and updates.

[Sughosha via Guix-patches via]

This patch series enables more features for lmms and carla, fixes issues with
them and updates them.

New features of lmms:
* libsoundio support
* PulseAudio support
* MP3/Lame support
* Stk Mallets plugin
* GIG player plugin
* Wayland support

Fixes of issues with lmms:
* Building Carla Patchbay & Carla Rack plugins

New variable, lmms-1.3, tracking the in-development 1.3 release.

New features of carla:
* PulseAudio support
* Search paths to look for plugins and SF2/SFZ instruments.
* Wayland support

Fixes of issues with carla:
* Making the other carla scripts executable.

Update of carla to 2.5.9 and carla-2.6 to 2.6.0-1.17000e7.

Sughosha (19):
  gnu: lmms: Fix building carla plugins.
  gnu: carla: Fix making carla executable.
  gnu: lmms: Enable libsoundio and PulseAudio support.
  gnu: carla: Enable PulseAudio support.
  gnu: lmms: Enable MP3 file format support for project export.
  gnu: carla: Add native-search-paths.
  gnu: Add stk.
  gnu: lmms: Enable Stk Mallets and GIG Player.
  gnu: lmms: Enable Wayland support.
  gnu: carla: Enable Wayland support.
  gnu: Add ringbuffer.
  gnu: Add libbinio.
  gnu: Add adplug.
  gnu: Add exprtk.
  gnu: carla: Update to 2.5.9.
  gnu: Add carla-2.4.
  gnu: lmms: Replace carla with carla-2.4.
  gnu: Add lmms-1.3.
  gnu: carla-2.6: Update to 2.6.0-1.17000e7.

 gnu/local.mk                              |   1 +
 gnu/packages/audio.scm                    | 152 +++++++++++++-
 gnu/packages/cpp.scm                      |  37 +++-
 gnu/packages/maths.scm                    |  53 +++++
 gnu/packages/music.scm                    | 233 +++++++++++++++++++++-
 gnu/packages/patches/stk-5.0.1-typo.patch |   8 +
 6 files changed, 468 insertions(+), 16 deletions(-)
 create mode 100644 gnu/packages/patches/stk-5.0.1-typo.patch


base-commit: 369d2698b0bfc3726f8e6d232d43d0dda832225f
-- 
2.46.0

[bug#74723] [PATCH 01/19] gnu: lmms: Fix building carla plugins.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[source]: Add snippet to fix including carla
headers.

Change-Id: I22a33e889b49567dc71d21f5e5893341564afbf5
---
 gnu/packages/music.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cd9cdbdacd..b72e607a25 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5170,7 +5170,16 @@ (define-public lmms
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "11xgf461cnmq0jkgdgx5bddi87ammpik4whg1m4fcvd3i0d5i601"))))
+         "11xgf461cnmq0jkgdgx5bddi87ammpik4whg1m4fcvd3i0d5i601"))
+       (modules '((guix build utils)))
+       ;; Include carla headers from the system.
+       (snippet
+        '(substitute* "plugins/carlabase/carla.h"
+           (("\"CarlaNativePlugin\\.h\"")
+            "<carla/includes/CarlaNativePlugin.h>")
+           (("\"CarlaBackend\\.h\"") "<carla/CarlaBackend.h>")
+           (("\"CarlaNative\\.h\"") "<carla/includes/CarlaNative.h>")
+           (("\"CarlaUtils\\.h\"") "<carla/CarlaUtils.h>")))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.46.0

[bug#74723] [PATCH 02/19] gnu: carla: Fix making carla executable.

[Sughosha via Guix-patches via]

This commit fixes lmms opening carla.

* gnu/packages/audio.scm (carla)[arguments]<#:phases>: In make-carla-executable
phase, also make carla-control, carla-jack-multi, carla-jack-single,
carla-patchbay and carla-rack executable. In wrap-executables phase, also wrap
the other executables and resources.

Change-Id: I529ccf91d3254bc9e20259460c24a6932654a45e
---
 gnu/packages/audio.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f842d77031..4864f41223 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5754,13 +5754,32 @@ (define-public carla
                    (invoke "make" "features")))
                (add-after 'install 'make-carla-executable
                  (lambda _
-                   (chmod (string-append #$output "/share/carla/carla") #o555)))
+                   (with-directory-excursion (string-append #$output
+                                                           "/share/carla")
+                     (for-each (lambda (file)
+                               (chmod file #o555))
+                      (list "carla"
+                            "carla-control"
+                            "carla-jack-multi"
+                            "carla-jack-single"
+                            "carla-patchbay"
+                            "carla-rack")))))
                (add-after 'install 'wrap-executables
                  (lambda* (#:key inputs #:allow-other-keys)
-                   (wrap-script (string-append #$output "/bin/carla")
-                                #:guile (search-input-file inputs "bin/guile")
-                                `("GUIX_PYTHONPATH" ":" prefix
-                                  (,(getenv "GUIX_PYTHONPATH")))))))))
+                   (with-directory-excursion #$output
+                     (for-each (lambda (file)
+                                 ;; Wrap only those executable files that other
+                                 ;; programs (e.g. lmms) would call.
+                                 (when (and (executable-file? file)
+                                            (not (symbolic-link? file))
+                                            (not (string-suffix? ".py" file)))
+                                   (wrap-script file
+                                     #:guile (search-input-file inputs
+                                                                "bin/guile")
+                                     `("GUIX_PYTHONPATH" ":" prefix
+                                       (,(getenv "GUIX_PYTHONPATH"))))))
+                    (append (find-files "bin")
+                            (find-files "share/carla/resources")))))))))
     (inputs
      (list alsa-lib
            ffmpeg
-- 
2.46.0

[bug#74723] [PATCH 03/19] gnu: lmms: Enable libsoundio and PulseAudio support.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[inputs]: Add libsoundio and pulseaudio.

Change-Id: I05d0080d85e21606dde6cad4248c774c166a987e
---
 gnu/packages/music.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b72e607a25..075aee4e34 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5230,9 +5230,11 @@ (define-public lmms
            libogg
            libsamplerate
            libsndfile
+           libsoundio
            libvorbis
            libxft
            portaudio
+           pulseaudio
            qtbase-5
            qtx11extras
            sdl))
-- 
2.46.0

[bug#74723] [PATCH 04/19] gnu: carla: Enable PulseAudio support.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla)[inputs]: Add pulseaudio.

Change-Id: I2d08897bd8686187fafffea2702d50da55ef6cec
---
 gnu/packages/audio.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4864f41223..eaa482a5ff 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5790,6 +5790,7 @@ (define-public carla
            libx11
            gtk+-2              ;needed for bridging GTK2 plugins in GTK3 hosts
            gtk+
+           pulseaudio
            python-pyliblo
            python-pyqt
            python-rdflib
-- 
2.46.0

[bug#74723] [PATCH 05/19] gnu: lmms: Enable MP3 file format support for project export.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[inputs]: Add lame.

Change-Id: Ic185212b9896984fd4039f5e56358f599036f79a
---
 gnu/packages/music.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 075aee4e34..871e3e0e1e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5227,6 +5227,7 @@ (define-public lmms
            freetype
            jack-2
            ladspa
+           lame
            libogg
            libsamplerate
            libsndfile
-- 
2.46.0

[bug#74723] [PATCH 06/19] gnu: carla: Add native-search-paths.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla)[native-search-paths]: Add CLAP_PATH,
LADSPA_PATH, LV2_PATH, LXVST_PATH, VST2_PATH, VST3_PATH, SF1_PATH and SFZ_PATH
variables.

Change-Id: I30af5a75b026eb56de5311a753ad789c093c0556
---
 gnu/packages/audio.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index eaa482a5ff..e2aff58394 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5805,6 +5805,31 @@ (define-public carla
            guile-2.2))
     (native-inputs
      (list pkg-config))
+    (native-search-paths
+       (list (search-path-specification
+              (variable "CLAP_PATH")
+              (files '("lib/clap")))
+             (search-path-specification
+              (variable "LADSPA_PATH")
+              (files '("lib/ladspa")))
+             (search-path-specification
+              (variable "LV2_PATH")
+              (files '("lib/lv2")))
+             (search-path-specification
+              (variable "LXVST_PATH")
+              (files '("lib/lxvst")))
+             (search-path-specification
+              (variable "VST2_PATH")
+              (files '("lib/vst")))
+             (search-path-specification
+              (variable "VST3_PATH")
+              (files '("lib/vst3")))
+             (search-path-specification
+              (variable "SF2_PATH")
+              (files '("share/sf2")))
+             (search-path-specification
+              (variable "SFZ_PATH")
+              (files '("share/sfz")))))
     (home-page "https://kx.studio/Applications:Carla")
     (synopsis "Audio plugin host")
     (description "Carla is a modular audio plugin host, with features like
-- 
2.46.0

[bug#74723] [PATCH 07/19] gnu: Add stk.

[Sughosha via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 8304 bytes --]

* gnu/packages/music.scm (stk): New variable.
* gnu/packages/patches/stk-5.0.1-typo.patch: New file.
* gnu/local.mk: Register the patch file.

Change-Id: Iaa2e30506b00c9636b79fe47ee69455c1919c83b
---
 gnu/local.mk                              |   1 +
 gnu/packages/music.scm                    | 120 +++++++++++++++++++++-
 gnu/packages/patches/stk-5.0.1-typo.patch |   8 ++
 3 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/stk-5.0.1-typo.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c89fd88282..45e7382bf9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1951,6 +1951,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/sioyek-fix-build.patch			\
   %D%/packages/patches/smalltalk-multiplication-overflow.patch	\
   %D%/packages/patches/sqlite-hurd.patch			\
+  %D%/packages/patches/stk-5.0.1-typo.patch			\
   %D%/packages/patches/strace-readlink-tests.patch		\
   %D%/packages/patches/sunxi-tools-remove-sys-io.patch	\
   %D%/packages/patches/p11-kit-hurd.patch			\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 871e3e0e1e..de6ef7e7f6 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -45,7 +45,7 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Thomas Albers Raviola <thomas@thomaslabs.org>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
+;;; Copyright © 2022, 2023, 2024 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
@@ -1793,6 +1793,124 @@ (define-public music21
     ;; Software is dual-licensed.
     (license (list license:bsd-3 license:lgpl3+))))
 
+(define-public stk
+  (package
+    (name "stk")
+    (version "5.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://ccrma.stanford.edu/software/stk/"
+                                  "release/stk-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1151cpapg8vc8g2sldkgsj6psksyfkxb77cdrg5am2xvlfp5zhxg"))
+              (patches
+               (search-patches "stk-5.0.1-typo.patch"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Fix commands.
+                  (substitute* (find-files "." "Makefile\\.in")
+                    (("/bin/") ""))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:tests? #f ;no tests
+           #:configure-flags
+           #~(list (string-append "RAWWAVE_PATH=" #$output
+                                  "/share/stk/rawwaves/"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-paths
+                 (lambda _
+                   (with-directory-excursion "projects"
+                     (for-each (lambda (file)
+                                 (substitute* (string-drop-right file 4)
+                                   (("wish") (which "wish"))
+                                   (("< tcl") (string-append "< " #$output:gui
+                                                             "/share/stk/tcl"))
+                                   (("\\./") (string-append #$output "/bin/"))))
+                      (find-files "." "\\.bat$"))
+                     (substitute* (find-files "share/stk/tcl" "\\.tcl$")
+                       (("tcl/bitmaps")
+                        (string-append #$output:gui "/share/stk/tcl/bitmaps")))
+                     (substitute* (find-files "." "\\.cpp$")
+                       (("\\.\\./\\.\\./rawwaves")
+                        (string-append #$output "/share/stk/rawwaves"))
+                       (("\"rawwaves")
+                        (string-append "\"" #$output "/share/stk/rawwaves"))))))
+               (add-after 'install 'install-data
+                 (lambda _
+                   (let* ((bin (string-append #$output "/bin"))
+                          (data (string-append #$output "/share/stk"))
+                          (rawwaves (string-append data "/rawwaves"))
+                          (scores (string-append data "/scores"))
+                          (gui (string-append #$output:gui "/bin"))
+                          (tcl (string-append #$output:gui "/share/stk/tcl")))
+                     (mkdir-p data)
+                     ;; Install rawwaves.
+                     (copy-recursively "rawwaves" rawwaves)
+                     ;; Install projects.
+                     (with-directory-excursion "projects"
+                       ;; Install project binaries.
+                       (for-each (lambda (file)
+                                   (install-file file bin))
+                        (list "demo/stk-demo"
+                              "effects/effects"
+                              "examples/audioprobe"
+                              "examples/bethree"
+                              "examples/controlbee"
+                              "examples/crtsine"
+                              "examples/duplex"
+                              "examples/foursine"
+                              "examples/grains"
+                              "examples/inetIn"
+                              "examples/inetOut"
+                              "examples/midiprobe"
+                              "examples/play"
+                              "examples/playsmf"
+                              "examples/record"
+                              "examples/rtsine"
+                              "examples/sine"
+                              "examples/sineosc"
+                              "examples/threebees"
+                              "eguitar/eguitar"
+                              "ragamatic/ragamat"))
+                       ;; Install project rawwaves.
+                       (for-each (lambda (dir)
+                                   (copy-recursively dir rawwaves))
+                        (list "examples/rawwaves"
+                              "ragamatic/rawwaves"))
+                       ;; Install project scores.
+                       (for-each (lambda (dir)
+                                   (copy-recursively dir scores))
+                        (list "demo/scores"
+                              "eguitar/scores"
+                              "examples/scores"))
+                       ;; Install GUI scripts.
+                       (for-each (lambda (file)
+                                   (install-file (string-drop-right file 4) gui))
+                        (find-files "." "\\.bat"))
+                       ;; Install TCL files
+                       (for-each (lambda (dir)
+                                   (copy-recursively dir tcl))
+                        (list "demo/tcl"
+                              "effects/tcl"
+                              "eguitar/tcl"
+                              "ragamatic/tcl")))))))))
+    (outputs
+     '("out" "gui"))
+    (inputs
+     (list alsa-lib jack-2 tk))
+    (home-page "https://ccrma.stanford.edu/software/stk/")
+    (synopsis "Audio signal processing and algorithmic synthesis classes")
+    (description
+     "Synthesis ToolKit in C++ (STK) is a set of audio signal processing and
+algorithmic synthesis classes written in C++.
+
+This package also provides its demo project, examples, ElectricGuitar,
+RagaMatic and Effects.")
+    (license (license:non-copyleft "file:///LICENSE"))))
+
 (define-public abjad
   (package
     (name "abjad")
diff --git a/gnu/packages/patches/stk-5.0.1-typo.patch b/gnu/packages/patches/stk-5.0.1-typo.patch
new file mode 100644
index 0000000000..b4160dcdc6
--- /dev/null
+++ b/gnu/packages/patches/stk-5.0.1-typo.patch
@@ -0,0 +1,8 @@
+This patch fixes typo.
+
+diff -ruN stk-5.0.1-a/projects/eguitar/ElectricGuitar stk-5.0.1-b/projects/eguitar/ElectricGuitar
+--- stk-5.0.1-a/projects/eguitar/ElectricGuitar	2024-11-30 15:07:14.267988301 +0530
++++ stk-5.0.1-b/projects/eguitar/ElectricGuitar	2024-11-30 15:05:40.951986213 +0530
+@@ -1 +1 @@
+-wish < tcl/Eguitar.tcl | ./eguitar -or -ip
++wish < tcl/EGuitar.tcl | ./eguitar -or -ip
-- 
2.46.0

[bug#74723] [PATCH 08/19] gnu: lmms: Enable Stk Mallets and GIG Player.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[inputs]: Add libgig and stk.
[arguments]<#:phases>: Add patch-stk-path.

Change-Id: I8116d603399f75571dfc37bc43760334df3a764e
---
 gnu/packages/music.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index de6ef7e7f6..844347af62 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5313,6 +5313,12 @@ (define-public lmms
             (lambda* (#:key inputs #:allow-other-keys)
               (copy-recursively (assoc-ref inputs "rpmalloc")
                                 "src/3rdparty/rpmalloc/rpmalloc")))
+          (add-after 'unpack 'patch-stk-path
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (substitute* "cmake/modules/FindSTK.cmake"
+                    (("/usr") (assoc-ref inputs "stk")))
+                  (substitute* "src/core/ConfigManager.cpp"
+                    (("/usr") (assoc-ref inputs "stk")))))
           (add-before 'configure 'set-ldflags
             (lambda _
               (setenv "LDFLAGS"
@@ -5346,6 +5352,7 @@ (define-public lmms
            jack-2
            ladspa
            lame
+           libgig
            libogg
            libsamplerate
            libsndfile
@@ -5356,7 +5363,8 @@ (define-public lmms
            pulseaudio
            qtbase-5
            qtx11extras
-           sdl))
+           sdl
+           stk))
     (home-page "https://lmms.io/")
     (synopsis "Music composition tool")
     (description "LMMS is a digital audio workstation.  It includes tools for
-- 
2.46.0

[bug#74723] [PATCH 09/19] gnu: lmms: Enable Wayland support.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[build-system]: Switch to qt-build-system.
[inputs]: Add qtwayland-5.

Change-Id: I8c35072747d16158c3adefa115f5f37c90bcbf33
---
 gnu/packages/music.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 844347af62..b21d8b4021 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5298,7 +5298,7 @@ (define-public lmms
            (("\"CarlaBackend\\.h\"") "<carla/CarlaBackend.h>")
            (("\"CarlaNative\\.h\"") "<carla/includes/CarlaNative.h>")
            (("\"CarlaUtils\\.h\"") "<carla/CarlaUtils.h>")))))
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
     (arguments
      (list
       #:tests? #f                       ; no tests
@@ -5362,6 +5362,7 @@ (define-public lmms
            portaudio
            pulseaudio
            qtbase-5
+           qtwayland-5
            qtx11extras
            sdl
            stk))
-- 
2.46.0

[bug#74723] [PATCH 10/19] gnu: carla: Enable Wayland support.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla)[arguments]<#:phases>: In wrap-executables
phase, wrap the executables with QT_PLUGIN_PATH.
[inputs]: Add qtwayland-5.

Change-Id: I2c0fb1a048f5e2331bd9335acff42c8c194c3f26
---
 gnu/packages/audio.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e2aff58394..13ed6c7127 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5777,7 +5777,9 @@ (define-public carla
                                      #:guile (search-input-file inputs
                                                                 "bin/guile")
                                      `("GUIX_PYTHONPATH" ":" prefix
-                                       (,(getenv "GUIX_PYTHONPATH"))))))
+                                       (,(getenv "GUIX_PYTHONPATH")))
+                                     `("QT_PLUGIN_PATH" ":" prefix
+                                       (,(getenv "QT_PLUGIN_PATH"))))))
                     (append (find-files "bin")
                             (find-files "share/carla/resources")))))))))
     (inputs
@@ -5799,6 +5801,7 @@ (define-public carla
            ;; (ModuleNotFoundError: No module named 'PyQt5')
            python-wrapper
            qtbase-5
+           qtwayland-5
            zlib
 
            ;; For WRAP-SCRIPT above.
-- 
2.46.0

[bug#74723] [PATCH 11/19] gnu: Add ringbuffer.

[Sughosha via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2211 bytes --]

* gnu/packages/audio.scm (ringbuffer): New variable.

Change-Id: I92765a33ac38a947098a3aba1078adb1a1d622f5
---
 gnu/packages/audio.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 13ed6c7127..13c9e4d768 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -49,6 +49,7 @@
 ;;; Copyright © 2024 hapster <o.rojon@posteo.net>
 ;;; Copyright © 2024 mio <stigma@disroot.org>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
+;;; Copyright © 2024 Sughosha <sughosha@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3568,6 +3569,37 @@ (define-public pcaudiolib
                    (license:non-copyleft
                     "file://src/TPCircularBuffer/README.markdown")))))
 
+(define-public ringbuffer
+  (package
+    (name "ringbuffer")
+    (version "0.9.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/JohannesLorenz/ringbuffer")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1c57hj6zyvcjpcbwrq8c1hj5brk1bnh69ayd88ny1p0gx031sjpk"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list (string-append "-DINSTALL_LIB_DIR=" #$output "/lib"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-export-header
+                 (lambda _
+                   (install-file "src/lib/ringbuffer_export.h"
+                                 (string-append #$output
+                                                "/include/ringbuffer")))))))
+    (home-page "https://github.com/JohannesLorenz/ringbuffer")
+    (synopsis "Lock-free multi-reader ringbuffer")
+    (description
+     "@code{ringbuffer} is a library containing a ringbuffer.  It is lock-free
+(using atomics only), and allows multiple readers, but only one writer.")
+    (license license:gpl3+)))
+
 (define-public qjackctl
   (package
     (name "qjackctl")
-- 
2.46.0

[bug#74723] [PATCH 12/19] gnu: Add libbinio.

[Sughosha via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2977 bytes --]

* gnu/packages/cpp.scm (libbinio): New variable.

Change-Id: I3f202f6da8617162654a8b4523b680a497909ba3
---
 gnu/packages/cpp.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index eacc6e46ab..7266efeb2a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -33,7 +33,7 @@
 ;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
-;;; Copyright © 2023 Sughosha <Sughosha@proton.me>
+;;; Copyright © 2023, 2024 Sughosha <Sughosha@proton.me>
 ;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -111,6 +111,7 @@ (define-module (gnu packages cpp)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
@@ -1834,6 +1835,40 @@ (define-public aws-sdk-cpp
     (home-page "https://github.com/aws/aws-sdk-cpp")
     (license license:asl2.0)))
 
+(define-public libbinio
+  (package
+    (name "libbinio")
+    (version "1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/adplug/libbinio")
+                    (commit (string-append "libbinio-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "010q3dgn8zdv5hnvbhhr0jzgzvhrmil395hx585yy7gsi8dsyr35"))
+              (modules '((guix build utils)))
+              (snippet
+               `(substitute* "doc/libbinio.texi"
+                  ;; Do not include version.texi which does not exist yet.
+                  ((".*version\\.texi.*") "")
+                  ;; Replace VERSION with the package version.
+                  (("@value\\{VERSION\\}") ,version)
+                  ;; Replace UPDATED with the date of the current commit.
+                  (("@value\\{UPDATED\\}") "7 August 2019")))))
+    (native-inputs
+     (list autoconf automake libtool texinfo))
+    (build-system gnu-build-system)
+    (home-page "http://adplug.github.io/libbinio/")
+    (synopsis "Binary I/O stream class library")
+    (description
+     "This binary I/O stream class library presents a platform-independent way
+to access binary data streams in C++.  The library is hardware independent in
+the form that it transparently converts between the different forms of
+machine-internal binary data representation.")
+    (license license:lgpl2.1+)))
+
 (define-public libexpected
   (package
     (name "libexpected")
-- 
2.46.0

[bug#74723] [PATCH 13/19] gnu: Add adplug.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (adplug): New variable.

Change-Id: I4a7eefac29db50573c0db161eaea49672a7828af
---
 gnu/packages/audio.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 13c9e4d768..2f2c294fb8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -159,6 +159,7 @@ (define-module (gnu packages audio)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
+  #:use-module (gnu packages texinfo)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system waf)
   #:use-module (guix download)
@@ -662,6 +663,37 @@ (define-public aubio
 streams from live audio.")
     (license license:gpl3+)))
 
+(define-public adplug
+  (package
+    (name "adplug")
+    (version "2.3.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/adplug/adplug")
+                    (commit (string-append "adplug-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1r23fndz8lpyga398qxp4iy8hxabmq5kx5n9407bx47sc32j3lnn"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Include mididata.h for installation.
+               '(substitute* "Makefile.am"
+                  (("pkginclude_HEADERS = ")
+                   (string-append "pkginclude_HEADERS = src/mididata.h "))))))
+    (native-inputs
+     (list autoconf automake libbinio libtool pkg-config texinfo))
+    (build-system gnu-build-system)
+    (home-page "https://adplug.github.io/")
+    (synopsis "AdLib sound player library")
+    (description
+     "AdPlug is a hardware independent AdLib sound player library, mainly
+written in C++.  AdPlug plays sound data, originally created for the AdLib
+(OPL2/3) audio board, on top of an OPL2/3 emulator or by using the real
+hardware.  No OPL2/3 chips are required for playback.")
+    (license license:lgpl2.1+)))
+
 (define-public dsp
   (package
     (name "dsp")
-- 
2.46.0

[bug#74723] [PATCH 14/19] gnu: Add exprtk.

[Sughosha via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 3305 bytes --]

* gnu/packages/maths.scm (exprtk): New variable.

Change-Id: I14bd7c26d111f399b5a3624456f43b3fe7dacd40
---
 gnu/packages/maths.scm | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9257a8adb7..e3638794ad 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -67,6 +67,7 @@
 ;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Sughosha <sughosha@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8079,6 +8080,58 @@ (define-public elemental
 reduction.")
       (license license:bsd-2))))
 
+(define-public exprtk
+  (let ((commit "7b993904a21639304edd4db261f6e2cdcf6d936b") ;no tags
+        (revision "0"))
+    (package
+      (name "exprtk")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/ArashPartow/exprtk")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0rza8lmn4mbdbrdj1aqir37nk8z034cqwr2s1ypyqgflckirwzdp"))
+                (modules '((guix build utils)))
+                (snippet
+                 ;; Prevent linking to /usr/lib.
+                 '(substitute* "Makefile"
+                    (("-L/usr/lib") "")))))
+      (build-system gnu-build-system)
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure) ;no configure script
+                 (replace 'check
+                   (lambda* (#:key tests? #:allow-other-keys)
+                     (when tests?
+                       (invoke "./exprtk_test"))))
+                 (replace 'install
+                   (lambda _
+                     ;; Install executable binaries excluding that of testing.
+                     (for-each (lambda (file)
+                                 (when (and (executable-file? file)
+                                            (not (string=? "exprtk_test"
+                                                           (basename file))))
+                                   (install-file file
+                                                 (string-append #$output
+                                                                "/bin"))))
+                      (find-files "."))
+                     ;; Install header.
+                     (install-file "exprtk.hpp"
+                                   (string-append #$output "/include")))))))
+      (home-page "https://github.com/ArashPartow/exprtk")
+      (synopsis "C++ mathematical expression parsing and evaluation library")
+      (description
+       "C++ Mathematical Expression Toolkit Library (ExprTk) is a run-time
+mathematical expression parsing and evaluation engine.  The parsing engine
+supports numerous forms of functional and  logic processing semantics and is
+easily extensible.")
+      (license license:expat))))
+
 (define-public mcrl2
   (package
     (name "mcrl2")
-- 
2.46.0

[bug#74723] [PATCH 15/19] gnu: carla: Update to 2.5.9.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla): Update to 2.5.9.
[inputs]: Add sdl2.

Change-Id: Iba9a43fc9ed3b752841721335459521b8eacddb5
---
 gnu/packages/audio.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 2f2c294fb8..4f32ce2131 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5793,7 +5793,7 @@ (define-public redkite
 (define-public carla
   (package
     (name "carla")
-    (version "2.4.1")
+    (version "2.5.9")
     (source
      (origin
        (method git-fetch)
@@ -5803,7 +5803,7 @@ (define-public carla
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01ngkmfcxyg1bb4qmfvlkkjbx4lx62akxqhizl8zmqnhfcy4p9bx"))))
+        (base32 "13whywiy6cyamsch1fzc6l5pgiid4cmmdffhaxsnj3k1sd7gmkql"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f                  ; no "check" target
@@ -5866,6 +5866,7 @@ (define-public carla
            python-wrapper
            qtbase-5
            qtwayland-5
+           sdl2
            zlib
 
            ;; For WRAP-SCRIPT above.
-- 
2.46.0

[bug#74723] [PATCH 16/19] gnu: Add carla-2.4.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla-2.4): New variable.

Change-Id: I1f915e897e2dda7cda1079657e39de80cedff4e4
---
 gnu/packages/audio.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4f32ce2131..f7cb4893be 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5907,6 +5907,20 @@ (define-public carla
 default and preferred audio driver but also supports native drivers like ALSA.")
     (license license:gpl2+)))
 
+(define-public carla-2.4
+  (package/inherit carla
+    (version "2.4.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/falkTX/Carla")
+         (commit (string-append "v" version))))
+       (file-name (git-file-name (package-name carla) version))
+       (sha256
+        (base32 "0x0vbq6q42jjwa303wdpykj724y1ic61gps6dlf8dnnfq0wkzq5i"))))))
+
 ;;; This package variant tracks the latest in-development 2.6 release.
 (define-public carla-2.6
   (let ((commit "aa400535b31c67f4b6c1b28e6e20e4d4f82111a3")
-- 
2.46.0

[bug#74723] [PATCH 17/19] gnu: lmms: Replace carla with carla-2.4.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms)[inputs]: Replace carla with carla-2.4.

Change-Id: I34798028d745df24cee7e77585879f51afb9f6d4
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b21d8b4021..5ec58119ff 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5344,7 +5344,7 @@ (define-public lmms
              "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay"))))))
     (inputs
      (list alsa-lib
-           carla
+           carla-2.4
            fftwf
            fltk
            fluidsynth
-- 
2.46.0

[bug#74723] [PATCH 18/19] gnu: Add lmms-1.3.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (lmms-1.3): New variable.

Change-Id: Ia921c482948d6d18d88ef1cba3630a7994fac5a3
---
 gnu/packages/music.scm | 84 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5ec58119ff..42688f2eac 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -163,6 +163,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages mpd)
   #:use-module (gnu packages ncurses)
@@ -213,6 +214,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
+  #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:select (last)))
 
 (define-public alsa-scarlett-gui
@@ -5374,6 +5376,88 @@ (define-public lmms
 can receive input from a MIDI keyboard.")
     (license license:gpl2+)))
 
+;;; This package variant tracks the latest in-development 1.3 release.
+(define-public lmms-1.3
+  (let ((commit "d9737881cf482e89969948f56da954cbf5c11aca") ;from master branch
+        (revision "0"))
+    (package/inherit lmms
+      (version (git-version "1.3.0-alpha.1" revision commit))
+      (source
+       (origin
+         (inherit (package-source lmms))
+         (uri (git-reference
+                (url "https://github.com/LMMS/lmms")
+                (commit commit)
+                ;; Clone recursively for optional plugins.
+                (recursive? #t)))
+         (file-name (git-file-name (package-name lmms) version))
+         (sha256
+          (base32 "0hscgnbladrkbvv551bv7vzi5949gjhf397j35wghd07hwd2lrb0"))
+         (modules '((guix build utils)))
+         (snippet
+          '(begin
+             ;; Delete the bundled 3rd party libraries.
+             (for-each delete-file-recursively
+               (list "plugins/CarlaBase/carla"
+                     "plugins/OpulenZ/adplug"
+                     "plugins/Xpressive/exprtk"
+                     "src/3rdparty"))
+             (substitute* "CMakeLists.txt"
+               ;; Do not check the submodules.
+               ((".*CheckSubmodules.*") "")
+               ;; Unuse the bundled weakjack.
+               (("JACK libraries\" ON") "JACK libraries\" OFF"))
+             (substitute* "src/CMakeLists.txt"
+               ((".*3rdparty.*") "")
+               ;; Use adplug and ringbuffer from the system.
+               (("\\$\\{EXTRA_LIBRARIES\\}")
+                "${EXTRA_LIBRARIES}\n\tadplug\n\tringbuffer"))
+             (with-directory-excursion "plugins"
+               ;; Use carla from the system.
+               (substitute* "CarlaBase/Carla.h"
+                 (("#include <CarlaDefines")
+                  "#include <carla/includes/CarlaDefines")
+                 (("#include <CarlaNative")
+                  "#include <carla/includes/CarlaNative")
+                 (("#include <CarlaBackend") "#include <carla/CarlaBackend")
+                 (("#include <CarlaUtils") "#include <carla/CarlaUtils"))
+               (with-directory-excursion "OpulenZ"
+                 ;; Unuse the bundled adplug.
+                 (substitute* "CMakeLists.txt"
+                   ((".*adplug .*") "")
+                   ((".*adplug/.*") "")
+                   (("^\\)") "")
+                   (("\\.png\"") ".png\"\n)"))
+                 ;; Use adplug from the system.
+                 (substitute* "OpulenZ.cpp"
+                   (("<opl\\.h>") "<adplug/opl.h>")
+                   (("<temuopl\\.h>") "<adplug/temuopl.h>")
+                   (("<mididata\\.h>") "<adplug/mididata.h>")))
+               ;; Unuse the bundled exprtk.
+               (substitute* "Xpressive/CMakeLists.txt"
+                 ((".*\\(exprtk .*") "")
+                 ((".*xpressive exprtk.*") "")))))))
+      (inputs
+       (modify-inputs (package-inputs lmms)
+         (delete "rpmalloc")
+         (replace "carla" carla)
+         (replace "sdl12-compat" sdl2)
+         (append adplug
+                 exprtk
+                 lame
+                 libxml2
+                 lilv
+                 lv2
+                 perl
+                 perl-list-moreutils
+                 perl-xml-parser
+                 ringbuffer
+                 suil)))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "LV2_PATH")
+              (files '("lib/lv2"))))))))
+
 (define-public stargate
   (package
     (name "stargate")
-- 
2.46.0

[bug#74723] [PATCH 19/19] gnu: carla-2.6: Update to 2.6.0-1.17000e7.

[Sughosha via Guix-patches via]

* gnu/packages/audio.scm (carla-2.6): Update to 2.6.0.-1.17000e7.
[inputs]: Replace python-pyqt with python-pyqt-6, qtbase-5 with qtbase
and qtwayland-5 with qtwayland.

Change-Id: Ic64f344a9e509bd9bf7963606002e66355b2231f
---
 gnu/packages/audio.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f7cb4893be..4fcda11698 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5923,8 +5923,8 @@ (define-public carla-2.4
 
 ;;; This package variant tracks the latest in-development 2.6 release.
 (define-public carla-2.6
-  (let ((commit "aa400535b31c67f4b6c1b28e6e20e4d4f82111a3")
-        (revision "0"))
+  (let ((commit "17000e7fe99459b25a50094a8b00bdfa12f2bfbc")
+        (revision "1"))
     (package
       (inherit carla)
       (name "carla")
@@ -5938,7 +5938,12 @@ (define-public carla-2.6
            (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0cnj2sgr60f5h6wdfmihc214wf3n74686sipl3iyzmylqrcyhbjn")))))))
+          (base32 "1bils2xr4zv4z70al0rg6bc1ijvn2cq6macq11skx7gzjlcw09bq"))))
+      (inputs
+       (modify-inputs (package-inputs carla-2.6)
+         (replace "python-pyqt" python-pyqt-6)
+         (replace "qtbase" qtbase)
+         (replace "qtwayland" qtwayland))))))
 
 (define-public ecasound
   (package
-- 
2.46.0