From 1493a9215bfe32b848d3ec44edcb9c6245d60714 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Sat, 15 Oct 2022 15:06:23 +0200
Subject: [PATCH 3/4] gnu: Add mruby-zest

* gnu/packages/fonts.scm (mruby-zest): New variable.
---
 gnu/packages/music.scm | 68 ++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5d3c19bc78..a09eb6528d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3133,52 +3133,42 @@ (define-public mruby-zest
 (define-public zynaddsubfx
   (package
     (name "zynaddsubfx")
-    (version (package-version mruby-zest))
+    (version "3.0.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "mirror://sourceforge/zynaddsubfx/zynaddsubfx/" version
-                    "/zynaddsubfx-" version ".tar.bz2"))
+                    "mirror://sourceforge/zynaddsubfx/zynaddsubfx/"
+                    version "/zynaddsubfx-" version ".tar.bz2"))
               (sha256
                (base32
-                "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb"))))
+                "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl"))))
     (build-system cmake-build-system)
     (arguments
-     (list #:configure-flags #~(list "-DGuiModule=zest"
-                                     (string-append "-DZYN_DATADIR="
-                                                    #$output
-                                                    "/share/zynaddsubfx"))
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'remove-sse-flags-from-generic-target
-                          (lambda _
-                            (substitute* "src/CMakeLists.txt"
-                              (("-msse -msse2 -mfpmath=sse")
-                               "")
-                              (("-march=(athlon64|core2)" flag)
-                               (string-append flag
-                                              " -msse -msse2 -mfpmath=sse")))))
-                        (add-after 'unpack 'fix-zyn-fusion-path
-                          (lambda _
-                            (substitute* "src/main.cpp"
-                              (("\\./zyn-fusion")
-                               (string-append #$mruby-zest
-                                              "/bin/zyn-fusion")))
-                            (substitute*
-                             "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp"
-                              (("\\./libzest\\.so")
-                               (string-append #$mruby-zest
-                                              "/lib/zyn-fusion/libzest.so"))))))))
-    (inputs (list alsa-lib
-                  fftwf
-                  jack-1
-                  liblo
-                  libxpm
-                  mesa
-                  minixml
-                  mruby-zest
-                  zlib))
-    (native-inputs (list doxygen pkg-config ruby))
-    (home-page "https://zynaddsubfx.sourceforge.io/")
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Move SSE compiler optimization flags from generic target to
+         ;; athlon64 and core2 targets, because otherwise the build would fail
+         ;; on non-Intel machines.
+         (add-after 'unpack 'remove-sse-flags-from-generic-target
+          (lambda _
+            (substitute* "src/CMakeLists.txt"
+              (("-msse -msse2 -mfpmath=sse") "")
+              (("-march=(athlon64|core2)" flag)
+               (string-append flag " -msse -msse2 -mfpmath=sse")))
+            #t)))))
+    (inputs
+     (list liblo
+           ntk
+           mesa
+           alsa-lib
+           jack-1
+           fftw
+           minixml
+           libxpm
+           zlib))
+    (native-inputs
+     (list pkg-config))
+    (home-page "http://zynaddsubfx.sf.net/")
     (synopsis "Software synthesizer")
     (description
      "ZynAddSubFX is a feature heavy realtime software synthesizer.  It offers
-- 
2.38.0