[bug#74398] [PATCH 0/4] gnu: vmpk: Update to 0.9.0.

[bug#74398] [PATCH 0/4] gnu: vmpk: Update to 0.9.0.

[Sughosha via Guix-patches via]

This patch series updates sonivox-eas to 0.5.1 and vmpk to 0.9.0.

Sughosha (4):
  gnu: Add sonivox.
  gnu: drumstick: Update to 2.9.1.
  gnu: sonivox-eas: Update to 1.5.1.
  gnu: vmpk: Update to 0.9.0.

 gnu/packages/music.scm | 85 ++++++++++++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 20 deletions(-)


base-commit: 2a6d96425eea57dc6dd48a2bec16743046e32e06
-- 
2.46.0

[bug#74398] [PATCH 1/4] gnu: Add sonivox.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (sonivox): New variable.

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

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 980bce6b30..e00dce3561 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5877,6 +5877,33 @@ (define-public sorcer
 the electronic or dubstep genre.")
       (license license:gpl3+))))
 
+(define-public sonivox
+  (package
+    (name "sonivox")
+    (version "3.6.14")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/pedrolcl/sonivox")
+                    (commit (string-append "v" version))))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0zn9v4lxjpnpdlpnv2px8ch3z0xagmqlvff5pd39pss3mxfp32g0"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DBUILD_TESTING=ON")))
+    (native-inputs
+     (list googletest))
+    (home-page "https://github.com/pedrolcl/sonivox")
+    (synopsis "Fork of the AOSP platform_external_sonivox")
+    (description "This project is a fork of the Android Open Source Project
+@code{platform_external_sonivox}.  It is a Wave Table synthesizer, using
+embedded samples.  It also supports external DLS soundfont files.  It is also a
+real time GM synthesizer.")
+    (license license:asl2.0)))
+
 (define-public sonivox-eas
   (package
     (name "sonivox-eas")

base-commit: 2a6d96425eea57dc6dd48a2bec16743046e32e06
-- 
2.46.0

[bug#74398] [PATCH 2/4] gnu: drumstick: Update to 2.9.1.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (drumstick): Update to 2.9.1.
[build-system]: Switch to qt-build-system.
[arguments]<#:qtbase>: Use qtbase.
[native-inputs]: Add qttools.
[inputs]: Remove qtbase-5 and qttools-5. Replace qtsvg-5 with qtsvg. Add
fluid-synth, pipewire, pulseaudio, qt5compat, qtwayland and sonivox.

Change-Id: I2db8ce32691dc8ad60c4437667d66681398abec3
---
 gnu/packages/music.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index e00dce3561..cf5dfa8493 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3337,25 +3337,34 @@ (define-public frescobaldi
 (define-public drumstick
   (package
     (name "drumstick")
-    (version "2.3.1")
+    (version "2.9.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/drumstick/"
                                   version "/drumstick-" version ".tar.bz2"))
               (sha256
                (base32
-                "1rs248pkgn6d29nkvw9ab6dvi1vsz220jdmz1ddzr29cpyc0adfh"))))
-    (build-system cmake-build-system)
+                "1n1kkxkl1y4bwbm8hmqbc58l643qpyh8s7r4rw6jzi63jkvad42k"))))
+    (build-system qt-build-system)
     (arguments
-     `(#:tests? #f))                      ; no test target
+     (list #:qtbase qtbase
+           #:tests? #f)) ;no test target
     (inputs
-     (list qtbase-5 qtsvg-5 qttools-5 alsa-lib))
+     (list alsa-lib
+           fluidsynth
+           pipewire
+           pulseaudio
+           qt5compat
+           qtsvg
+           qtwayland
+           sonivox))
     (native-inputs
      (list pkg-config
            libxslt ; for xsltproc
            docbook-xsl
            doxygen
-           graphviz)) ; for dot
+           graphviz ; for dot
+           qttools))
     (home-page "https://drumstick.sourceforge.io/")
     (synopsis "C++ MIDI library")
     (description
-- 
2.46.0

[bug#74398] [PATCH 3/4] gnu: sonivox-eas: Update to 1.5.1.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (sonivox-eas): Update to 1.5.1.
[build-system]: Switch to qt-build-system.
[arguments]<#:qtbase>: Use qtbase.
[inputs]: Remove qtbase-5. Add qtwayland and sonivox.
[license]: Remove asl2.0.

Change-Id: If65a359fcc70254f69edda318a72ea957572fb3f
---
 gnu/packages/music.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cf5dfa8493..ed260d27ba 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5916,7 +5916,7 @@ (define-public sonivox
 (define-public sonivox-eas
   (package
     (name "sonivox-eas")
-    (version "1.3.0")
+    (version "1.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5925,11 +5925,13 @@ (define-public sonivox-eas
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1ygmlrsdzxii2dvj6id2ai3xv3klw2x67ip5rcp823jzczl0wpjd"))))
-    (build-system cmake-build-system)
-    (arguments '(#:tests? #f)) ; there are no tests
+                "1y67bi2vcwb1avwz18i41q85cmqx9svwx4q3kpmh951l49s9k8vz"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:tests? #f)) ; there are no tests
     (inputs
-     (list alsa-lib drumstick pulseaudio qtbase-5))
+     (list alsa-lib drumstick pulseaudio qtwayland sonivox))
     (native-inputs
      (list pkg-config))
     (home-page "https://github.com/pedrolcl/Linux-SonivoxEas")
@@ -5937,9 +5939,7 @@ (define-public sonivox-eas
     (description "This project is a real time General MIDI synthesizer based
 on the Sonivox EAS Synthesizer by Google.  It does not need external
 soundfonts, using embedded samples instead.")
-    ;; Sonivox is released under the ASL2.0; the rest of the code is under
-    ;; GPLv2+.
-    (license (list license:gpl2+ license:asl2.0))))
+    (license license:gpl2+)))
 
 (define-public whysynth
   (package
-- 
2.46.0

[bug#74398] [PATCH 4/4] gnu: vmpk: Update to 0.9.0.

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (vmpk): Update to 0.9.0.
[build-system]: Switch to qt-build-system.
[arguments]<#:qtbase>: Use qtbase.
<#:phases>: Add wrap-drumstick.
[inputs]: Remove qtbase-5. Replace qtsvg-5 with qtsvg. Add qtwayland.
[native-inputs]: Replace qttools-5 with qttools.

Change-Id: I3aced579ece316348c900409171e63c3c2cfa192
---
 gnu/packages/music.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ed260d27ba..3742e4ea2f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3379,22 +3379,31 @@ (define-public drumstick
 (define-public vmpk
   (package
     (name "vmpk")
-    (version "0.8.4")
+    (version "0.9.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/vmpk/vmpk/"
                                   version "/vmpk-" version ".tar.bz2"))
               (sha256
                (base32
-                "0kh8pns9pla9c47y2nwckjpiihczg6rpg96aignsdsd7vkql69s9"))))
-    (build-system cmake-build-system)
+                "1ndwmshw3skfcxb3f606hv4y80hfisfp5bdc81a0f0qrpx6f2zn4"))))
+    (build-system qt-build-system)
     (arguments
-     `(#:tests? #f))  ; no test target
+     (list #:qtbase qtbase
+           #:tests? #f  ; no test target
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'wrap-drumstick
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (wrap-program (string-append #$output "/bin/vmpk")
+                     `("DRUMSTICKRT" =
+                       (,(search-input-directory inputs
+                                            "/lib/drumstick2")))))))))
     (inputs
-     (list drumstick qtbase-5 qtsvg-5 qtx11extras))
+     (list drumstick qt5compat qtsvg qtwayland))
     (native-inputs
      (list libxslt ;for xsltproc
-           docbook-xml-4.4 docbook-xsl qttools-5 pkg-config))
+           docbook-xml-4.4 docbook-xsl qttools pkg-config))
     (home-page "https://vmpk.sourceforge.io/")
     (synopsis "Virtual MIDI piano keyboard")
     (description
-- 
2.46.0