From patchwork Sat Apr 4 21:14:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Theodotou X-Patchwork-Id: 21105 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BB88327BBE4; Sat, 4 Apr 2020 22:15:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 488AE27BBE1 for ; Sat, 4 Apr 2020 22:15:10 +0100 (BST) Received: from localhost ([::1]:42286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKq8D-0000uk-RP for patchwork@mira.cbaines.net; Sat, 04 Apr 2020 17:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60000) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKq88-0000ub-42 for guix-patches@gnu.org; Sat, 04 Apr 2020 17:15:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKq86-0000BP-QI for guix-patches@gnu.org; Sat, 04 Apr 2020 17:15:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKq86-0000BH-Mt for guix-patches@gnu.org; Sat, 04 Apr 2020 17:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jKq86-0000Vm-Hi for guix-patches@gnu.org; Sat, 04 Apr 2020 17:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40441] [PATCH 3/3] gnu: Add zynfusion. Resent-From: Alexandros Theodotou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40441@debbugs.gnu.org X-Debbugs-Original-To: Guix patches Received: via spool by submit@debbugs.gnu.org id=B.15860348641815 (code B ref -1); Sat, 04 Apr 2020 21:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2020 21:14:24 +0000 Received: from localhost ([127.0.0.1]:44910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKq7U-0000TC-6K for submit@debbugs.gnu.org; Sat, 04 Apr 2020 17:14:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:48846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKq7S-0000T0-CG for submit@debbugs.gnu.org; Sat, 04 Apr 2020 17:14:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59891) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKq7R-0000pH-2W for guix-patches@gnu.org; Sat, 04 Apr 2020 17:14:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKq7P-0007yg-L3 for guix-patches@gnu.org; Sat, 04 Apr 2020 17:14:21 -0400 Received: from mout01.posteo.de ([185.67.36.141]:34013) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKq7P-0007y5-BD for guix-patches@gnu.org; Sat, 04 Apr 2020 17:14:19 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 03EA516005C for ; Sat, 4 Apr 2020 23:14:17 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48vqLJ6yycz6tm6 for ; Sat, 4 Apr 2020 23:14:16 +0200 (CEST) Message-ID: From: Alexandros Theodotou Date: Sat, 04 Apr 2020 22:14:12 +0100 User-Agent: Evolution 3.32.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, This patch adds zynfusion. The LV2 plugin seems to work well and its LV2 presets also work. Some problems that are still pending: - the binary (standalone) version doesn't work (needs some rtpath- related patch I'm not sure how to do) - preset banks are not found by the plugin, even though I patched what appears to be the paths it looks at Feel free to edit it. Thanks, Alex From 8bf94ba51559ae4357b6619d61ef13b48e886940 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 4 Apr 2020 22:06:27 +0100 Subject: [PATCH 3/3] gnu: Add zynfusion. * gnu/packages/music.scm (zynfusion): New variable. --- gnu/packages/music.scm | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7d0cfe8665..2b5c6cc462 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -128,6 +128,7 @@ #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) + #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) @@ -5383,3 +5384,71 @@ filtered, pitch shifted and ultimately disintegrated. This is an unofficial port of the Regrader plugin created by Igorski. It is available as an LV2 plugin and a standalone JACK application.") (license license:expat))) + +(define-public zynfusion + (package/inherit zynaddsubfx + (name "zynfusion") + (arguments + `(#:configure-flags + ;; Enable ZynFusion mode + '("-DGuiModule=zest" "-DDemoMode=false") + #: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)) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((zest (assoc-ref inputs "mruby-zest")) + (out (assoc-ref %outputs "out"))) + ;; Patch zest path so that the ZynFusion UI can be found + (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" + (("\\./libzest\\.so") + (string-append zest "/lib/zynfusion/libzest.so"))) + (substitute* "src/main.cpp" + (("\\./zyn-fusion") + (string-append zest "/lib/zynfusion/zyn-fusion"))) + (substitute* "src/main.cpp" + (("\\\"zyn-fusion\\\"") + (string-append "\"" zest "/lib/zynfusion/zyn-fusion\""))) + ;; Patch banks path FIXME banks are still not found + (substitute* "src/Misc/Config.cpp" + (("cfg.bankRootDirList\\[4\\] =.*$") + (string-append "cfg.bankRootDirList[4] = \"" + out "/share/zynaddsubfx/banks\";\n"))) + #t))) + ;; Rename to avoid clashes with the zynaddsubfx package + (add-after 'install 'rename-to-zyn-fusion + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share"))) + (rename-file (string-append bin "/zynaddsubfx") + (string-append bin "/zynfusion")) + (substitute* (find-files (string-append share "/applications") + "\\.desktop$") + (("Exec=zynaddsubfx") + "Exec=zynfusion")) + #t)))))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cairo" ,cairo) + ("fftw" ,fftw) + ("jack" ,jack-1) + ("liblo" ,liblo) + ("libxpm" ,libxpm) + ("mesa" ,mesa) + ("minixml" ,minixml) + ("mruby-zest" ,mruby-zest) + ("ruby" ,ruby) + ("zlib" ,zlib))) + (description + "ZynFusion is an alternative, modern UI for the ZynAddSubFX +synthesizer."))) -- 2.26.0