From patchwork Sat Oct 15 14:14:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43423 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 183FD27BBEA; Sat, 15 Oct 2022 15:15:37 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0513427BBE9 for ; Sat, 15 Oct 2022 15:15:36 +0100 (BST) Received: from localhost ([::1]:48336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojhwt-0008An-48 for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 10:15:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojhwM-0008AL-9L for guix-patches@gnu.org; Sat, 15 Oct 2022 10:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojhwL-0002WH-VH for guix-patches@gnu.org; Sat, 15 Oct 2022 10:15:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojhwL-00008J-Qn for guix-patches@gnu.org; Sat, 15 Oct 2022 10:15:01 -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: Sat, 15 Oct 2022 14:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57984@debbugs.gnu.org Cc: Maxime Devos , Maxim Cournoyer Received: via spool by 57984-submit@debbugs.gnu.org id=B57984.1665843298489 (code B ref 57984); Sat, 15 Oct 2022 14:15:01 +0000 Received: (at 57984) by debbugs.gnu.org; 15 Oct 2022 14:14:58 +0000 Received: from localhost ([127.0.0.1]:42321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojhwH-00007o-Pd for submit@debbugs.gnu.org; Sat, 15 Oct 2022 10:14:58 -0400 Received: from mail-4319.protonmail.ch ([185.70.43.19]:48665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojhwD-00007T-Cs for 57984@debbugs.gnu.org; Sat, 15 Oct 2022 10:14:56 -0400 Date: Sat, 15 Oct 2022 14:14:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1665843286; x=1666102486; bh=fhvuer+NRMUlHoHQa9iViRAee9uZYV4+P5pxi6TiVIQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=XaucZZihZiLtzo5QT5QSA53Bja7ZPa3o8W/GultXxblFoXdU0Mnm9RvurDsiLzv3V q1QbvLlrn/RKFd994220QOR/gIe35NARqQlOR2FmuLQu/9TY2VlHCWrEf79y+ZfaWz dYhvlpUI1dynXeioV4yiS92hKOci2J1GXOIoSziamyYqrb7X7VdV636qZInnzQ8eEi 7jfEZ0FaHpk15ADUxIHwG/llCClzundxQDckeq5/iVGYj4MTT/Du3GXEH7Wmya+nLe 98T4B0NtR9a5YVQwhUycAqOeLLIyA8DFHHLHuhytKSFnDi5ea9DhJocACfyGGZfKB4 tdcwdyhtDhOyQ== Message-ID: In-Reply-To: References: <7sCHb5HxK6FIxg7kD6T0Fel6qnRoiecKy6WwKt-s0KAAKw9JQQzS3jd829nhYLIKfwytwHwQmI_IK3Zm4woqKmVqtQ0hBWkDzjpJlbspusg=@proton.me> <87czbfs0ls.fsf@gmail.com> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 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 7770a8393629eac18a706957757bead1e392776c Mon Sep 17 00:00:00 2001 From: Sughosha Date: Sat, 15 Oct 2022 15:59:55 +0200 Subject: [PATCH 4/4] gnu: zynaddsubfx: Update to 3.0.6 and switch to zyn-fusion * gnu/packages/music.scm (zynaddsubfx): Update to 3.0.6. [arguments]: Use gexp for simplicity. Switch from NTK to Zest. [inputs]: Replace ntk with mruby-zest. [native-inputs]: New dependencies. --- gnu/packages/music.scm | 70 ++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1ae54033c0..5d3c19bc78 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -167,7 +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 ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) @@ -3133,42 +3133,52 @@ (define-public mruby-zest (define-public zynaddsubfx (package (name "zynaddsubfx") - (version "3.0.5") + (version (package-version mruby-zest)) (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 - "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl")))) + "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb")))) (build-system cmake-build-system) (arguments - `(#: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/") + (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/") (synopsis "Software synthesizer") (description "ZynAddSubFX is a feature heavy realtime software synthesizer. It offers -- 2.38.0