From patchwork Wed Sep 21 17:21:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 42817 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 A44E927BBEA; Wed, 21 Sep 2022 18:22:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 048FE27BBE9 for ; Wed, 21 Sep 2022 18:22:14 +0100 (BST) Received: from localhost ([::1]:34688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ob3QL-0002kB-6U for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 13:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ob3QA-0002jr-EX for guix-patches@gnu.org; Wed, 21 Sep 2022 13:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ob3QA-0004gT-5x for guix-patches@gnu.org; Wed, 21 Sep 2022 13:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ob3QA-00082J-03 for guix-patches@gnu.org; Wed, 21 Sep 2022 13:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57984] [PATCH] gnu: Update zynaddsubfx to 3.0.6 Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Sep 2022 17:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57984@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.166378090130859 (code B ref -1); Wed, 21 Sep 2022 17:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Sep 2022 17:21:41 +0000 Received: from localhost ([127.0.0.1]:35162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ob3Pp-00081e-2z for submit@debbugs.gnu.org; Wed, 21 Sep 2022 13:21:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:50858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ob3Pf-00081P-Sx for submit@debbugs.gnu.org; Wed, 21 Sep 2022 13:21:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ob3Pe-00020a-Nl for guix-patches@gnu.org; Wed, 21 Sep 2022 13:21:31 -0400 Received: from mail-40135.protonmail.ch ([185.70.40.135]:57985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ob3PY-0004Xf-3j for guix-patches@gnu.org; Wed, 21 Sep 2022 13:21:30 -0400 Date: Wed, 21 Sep 2022 17:21:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1663780875; x=1664040075; bh=WBnbLc37t0ft58toQTopdKXFLj4RvsOaBOwax3f2ZMU=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=T76JN45EBtwoAO1SxkSEfjZkU3Kp/b1LTHUzPGGahehVK/UXdwJ8LGFO5xFEKMrHy yzpIXQWpfVQZ1u48bzc9NWMuRqPxwnoBiHv7l7M25BJMxTyzJgiqbmtgnO+ucTLzI0 52LHiGYh0MkurorDM6CEdHWibmkWaRGWi68R6ujrJ9yPwwW8+EVypszf/SAvMTD0L/ Vd0QKJkSUy6mjBl7zUnGtMoMVn3tkiUPlm9EKHMem731hM2vO4u0tbqUoejwVgjzoy 0G/Alwv8oLqZx97Y3c/jFLJxSG4WWhoHagPmgezNteKBsDxIeEpOUMOv/+QoBsaTNJ COnZwzMWuo0FA== Message-ID: <7sCHb5HxK6FIxg7kD6T0Fel6qnRoiecKy6WwKt-s0KAAKw9JQQzS3jd829nhYLIKfwytwHwQmI_IK3Zm4woqKmVqtQ0hBWkDzjpJlbspusg=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.135; envelope-from=Sughosha@proton.me; helo=mail-40135.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha X-getmail-retrieved-from-mailbox: Patches Empty Message From 77f364a304e4510baafe86f5a641bdf84952bf06 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Wed, 21 Sep 2022 19:15:47 +0200 Subject: [PATCH] gnu: Update zynaddsubfx to 3.0.6 gnu/packages/music.scm (mruby-zest): New variable. * gnu/packages/music.scm (zynaddsubfx): Update to 3.0.6. Upgrade to Zyn-Fusion with new UI called zest. --- gnu/packages/music.scm | 96 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 8 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 66b4beae0c..c9081bfb69 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -167,6 +167,7 @@ (define-module (gnu packages music) #: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 serialization) #:use-module (gnu packages sphinx) @@ -2989,10 +2990,69 @@ (define-public vmpk instrument or MIDI file player.") (license license:gpl3+))) +(define mruby-zest + (package + (name "mruby-zest") + (version "3.0.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mruby-zest/mruby-zest-build") + (commit version) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags `("CC=gcc" "CONFIG_SHELL=bash") + #:phases (modify-phases %standard-phases + ;; no configure rule available + (delete 'configure) + ;; no install rule available + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (string-append (assoc-ref outputs "out") + "/opt/zest"))) + (install-file "zest" out) + (install-file "libzest.so" out) + (install-file "mruby/bin/mruby" out) + (install-file "deps/nanovg/example/entypo.ttf" + (string-append out "/font")) + (install-file "deps/nanovg/example/Roboto-Bold.ttf" + (string-append out "/font")) + (install-file "deps/nanovg/example/Roboto-Light.ttf" + (string-append out "/font")) + (install-file "deps/nanovg/example/Roboto-Regular.ttf" + (string-append out "/font")) + (copy-recursively "src/mruby-zest/qml" + (string-append out "/qml")) + (copy-recursively "src/mruby-zest/example" + (string-append out "/qml")) + (invoke "touch" + (string-append out "/qml/MainWindow.qml")) + (copy-recursively "src/osc-bridge/schema" + (string-append out "/schema")) + (copy-file "completions/zyn-fusion" + (string-append out "/completions")) + (wrap-program (string-append out "/zest") + `("LD_LIBRARY_PATH" = + (,out))))))))) + (native-inputs (list ruby libuv pkg-config)) + (inputs (list libx11 mesa bash-minimal)) + (home-page "https://github.com/mruby-zest/mruby-zest-build") + (synopsis "Widget classes for the mruby-zest framework") + (description + "This repository contains all of the widgets needed to create the +@code{zyn-fusion} user interface for ZynAddSubFX.") + (license license:lgpl2.1))) + (define-public zynaddsubfx (package (name "zynaddsubfx") - (version "3.0.5") + (version (package-version mruby-zest)) (source (origin (method url-fetch) (uri (string-append @@ -3000,10 +3060,11 @@ (define-public zynaddsubfx version "/zynaddsubfx-" version ".tar.bz2")) (sha256 (base32 - "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl")))) + "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb")))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags `("-DGuiModule=zest") + #:phases (modify-phases %standard-phases ;; Move SSE compiler optimization flags from generic target to ;; athlon64 and core2 targets, because otherwise the build would fail @@ -3014,20 +3075,39 @@ (define-public zynaddsubfx (("-msse -msse2 -mfpmath=sse") "") (("-march=(athlon64|core2)" flag) (string-append flag " -msse -msse2 -mfpmath=sse"))) - #t))))) + #t)) + (add-after 'install 'link-zest + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((zestdir (string-append (assoc-ref inputs + "mruby-zest") + "/opt/zest")) + (bindir (string-append (assoc-ref outputs "out") + "/bin")) + (libdir (string-append (assoc-ref outputs "out") + "/lib"))) + (symlink (string-append zestdir "/libzest.so") + (string-append libdir "/libzest.so")) + (symlink (string-append zestdir "/zest") + (string-append bindir "/zyn-fusion")) + (symlink (string-append zestdir "/font") + (string-append libdir "/font")) + (symlink (string-append zestdir "/qml") + (string-append libdir "/qml")) + (symlink (string-append zestdir "/schema") + (string-append libdir "/schema")))))))) (inputs (list liblo - ntk + mruby-zest mesa alsa-lib jack-1 - fftw + fftwf minixml libxpm zlib)) (native-inputs - (list pkg-config)) - (home-page "http://zynaddsubfx.sf.net/") + (list pkg-config ruby doxygen)) + (home-page "https://zynaddsubfx.sourceforge.io/") (synopsis "Software synthesizer") (description "ZynAddSubFX is a feature heavy realtime software synthesizer. It offers -- 2.37.3