From patchwork Wed May 3 23:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49769 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 0790427BBEA; Thu, 4 May 2023 00:01:16 +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=ham 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 4E69727BBE2 for ; Thu, 4 May 2023 00:01:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puLT6-0006dL-Js; Wed, 03 May 2023 19:01:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puLT4-0006be-E3 for guix-patches@gnu.org; Wed, 03 May 2023 19:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puLT4-0002Ub-5p for guix-patches@gnu.org; Wed, 03 May 2023 19:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puLT4-0001G7-13 for guix-patches@gnu.org; Wed, 03 May 2023 19:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH 1/5] gnu: Add pugl. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2023 23:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831548574821 (code B ref 63254); Wed, 03 May 2023 23:01:01 +0000 Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:00:57 +0000 Received: from localhost ([127.0.0.1]:48039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLSz-0001Fg-2w for submit@debbugs.gnu.org; Wed, 03 May 2023 19:00:57 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:47939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLSw-0001FT-La for 63254@debbugs.gnu.org; Wed, 03 May 2023 19:00:56 -0400 Date: Wed, 03 May 2023 23:00:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683154847; x=1683414047; bh=pAWKlZW4pDPYFfO4g0rK7sg9hsfkb4sVM7XrssgZmK0=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Zmh/dNZfQhZhYjGSSssQOZShlQ4dFrqNFdyyVQUsHLrThZcVwpPYxsOApBHGOPAK+ QYn+XA13S+2JuteA4HRfi5Lik9J/cTaf6qE37u+iKcUvN2EXcEFcMOvx73ZW2toUL2 rpyhKbEM2viD3eUmgcVfmxUh4S9w/JbKkvCDnmK6+MhdpIzHWeqZ+as62OwEjE4S4H rGcJlx+qVN27wmTFTepo33URisUrYewnFqQi7imQ+9WyosG34T9fsfOFFYIBiTuU9x X0kfONDNGzSxTrRdbAys7rn5b/ifVsto42UzKVll8Lt79v1FWezBZthFSrzYycvxUd YZ6PCxZcqm+Fg== Message-ID: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (pugl): New variable. --- gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3a63d70c7a..e59d051f2e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -44,6 +44,7 @@ (define-module (gnu packages gl) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages linux) @@ -922,6 +923,40 @@ (define-public nanovg-for-extempore and visualizations.") (license license:zlib)))) +(define-public pugl + ;; No tags are available. + (let ((revision "0") + (commit "9b5a0871c1a8771dbe204e60f437653a67abd42a")) + (package + (name "pugl") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/lv2/pugl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16gcjz44d27j9ck7frpksy0jqscask2fvln9pb23k6xpq2lky3ar")) + (modules '((guix build utils))) + ;; Unbundle "sphinxygen". + (snippet + '(delete-file-recursively "subprojects")))) + (build-system meson-build-system) + (arguments + (list #:tests? #f ;tests contain manual tests + #:configure-flags + #~(list "-Ddocs=disabled"))) ;requires "sphinxygen" + (native-inputs (list pkg-config)) + (inputs (list cairo glu libx11 libxrandr libxcursor libxext mesa)) + (home-page "http://drobilla.net/software/pugl.html") + (synopsis "API for embeddable GUIs") + (description + "Pugl (PlUgin Graphics Library) is a portability layer for GUIs which is +suitable for use in plugins and applications.") + (license license:bsd-0)))) + (define-public gl2ps (package (name "gl2ps") From patchwork Wed May 3 23:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49770 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 8750D27BBE9; Thu, 4 May 2023 00:02:17 +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 3EB9427BBE2 for ; Thu, 4 May 2023 00:02:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puLU4-0006vY-6U; Wed, 03 May 2023 19:02:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puLU2-0006tV-Q8 for guix-patches@gnu.org; Wed, 03 May 2023 19:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puLU2-0002u0-Ho for guix-patches@gnu.org; Wed, 03 May 2023 19:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puLU2-0001Hy-BK for guix-patches@gnu.org; Wed, 03 May 2023 19:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH 2/5] gnu: Add nanovg. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2023 23:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831548784887 (code B ref 63254); Wed, 03 May 2023 23:02:02 +0000 Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:01:18 +0000 Received: from localhost ([127.0.0.1]:48044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLTK-0001Gl-H2 for submit@debbugs.gnu.org; Wed, 03 May 2023 19:01:18 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:36513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLTI-0001GY-Qy for 63254@debbugs.gnu.org; Wed, 03 May 2023 19:01:17 -0400 Date: Wed, 03 May 2023 23:01:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=aegbomfjcjgoply5v65uhaza3u.protonmail; t=1683154870; x=1683414070; bh=/lVOumJgTxF6WAjZ6tJG2e4uhf+Q/F+c+k1qWSvHbTg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=d+eFMgND5FdCPCjJCGPeLO5uNAlktOpxw+0EQU/HeKYUKw7ZWKk0+nmk02haRErQd rsouUmEtN6BlQolBP5aqB76WZQ6oRIWznTuovht7eXycuj1rQCtXWQn0eNZcbFLa4s MMfQu4bzDYX4m34+ygivsEQoKFE/sb6adWXK+EyHoWGMYePIvbMYawk5pOJxKtMJkL CTFYeMnesiedVn/9puXrGDBTTW2za+cX8d/tPos2S2ngvvnbb/14/ROHKpUGKfFOa+ yFy0RRAIlNj6/NyEb2szTByyEWHFJHUIYIJ0DkgU6Vq8ty17iZ1LW1WPj4RQeRoa+B snVbOGzhXQxxg== Message-ID: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (nanovg): New variable. --- gnu/packages/gl.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e59d051f2e..b67215b406 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -893,6 +893,52 @@ (define-public glfw and surfaces, receiving input and events.") (license license:zlib))) +(define-public nanovg + ;; No tags are available. + (let ((revision "0") + (commit "7544c114e83db7cf67bd1c9e012349b70caacc2f")) + (package + (name "nanovg") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/memononen/nanovg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0n29rxdp20xnvnpsjcmg3v5n6z7ya5ji4qirp18qcyls5xdxdxkc")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'build + (lambda _ + (invoke #$(cc-for-target) + "../source/src/nanovg.c" "-c" "-fPIC") + (invoke #$(cc-for-target) + "-shared" "-olibnanovg.so" "nanovg.o"))) + (replace 'install + (lambda _ + (let ((lib (string-append #$output "/lib")) + (include (string-append #$output + "/include"))) + (install-file "libnanovg.so" lib) + (with-directory-excursion "../source" + (for-each + (lambda (file) + (install-file file include)) + (find-files "src" "nanovg.*\\.h$"))))))))) + (home-page "https://github.com/memononen/nanovg") + (synopsis "2D vector drawing library on top of OpenGL") + (description + "NanoVG is an antialiased vector graphics rendering library for OpenGL. +It is aimed for building scalable user interfaces and visualizations.") + (license license:zlib)))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") From patchwork Wed May 3 23:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49771 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 D477D27BBE2; Thu, 4 May 2023 00:02:27 +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=ham 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 9760D27BBE9 for ; Thu, 4 May 2023 00:02:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puLU4-0006vc-W2; Wed, 03 May 2023 19:02:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puLU3-0006tc-8w for guix-patches@gnu.org; Wed, 03 May 2023 19:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puLU3-0002u5-1B for guix-patches@gnu.org; Wed, 03 May 2023 19:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puLU2-0001I5-QT for guix-patches@gnu.org; Wed, 03 May 2023 19:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH 3/5] gnu: Add rtosc. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2023 23:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831549094934 (code B ref 63254); Wed, 03 May 2023 23:02:02 +0000 Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:01:49 +0000 Received: from localhost ([127.0.0.1]:48048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLTo-0001HV-SF for submit@debbugs.gnu.org; Wed, 03 May 2023 19:01:49 -0400 Received: from mail-4319.protonmail.ch ([185.70.43.19]:37139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLTm-0001HG-VJ for 63254@debbugs.gnu.org; Wed, 03 May 2023 19:01:47 -0400 Date: Wed, 03 May 2023 23:01:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683154900; x=1683414100; bh=p8kWTAhFvPzCBKGo35ipKRI3qMskVRBxKtby+xoQjwg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Ichb7aStjZiev78nP8v8kZwLiLvdtou2YWCZtetw+26OcRZtzL1SSBI903hHgiinp N/W3Zw6yxpONn5yp+ZIohNwYxY0JGYf3q3cJoNkR2yCmZHn/0M8mym/buUr8UM0Vf8 fAwcL+DGg5uzR7y+n9Fc3h9zOaSo2Qu4aQZSetnv/UX+qk7MK+bKqHYn78gemCZ6zX YMwkJQyF3sMXMi9BfxkOxdAnzqL2yrUjgUvuTV0As4J5dln762MthnLsWBuAL+hK1o kmN0bIum7Kq8l5orizpwu+LyhLIl0Xt9ZRWQlCl4YERrgkyngLiJG5tkqH8M+UVWrx dNgf9KMe2n/UQ== Message-ID: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (rtosc): New variable. * gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 45 +++++++++++++++++++ ....3.1-fix-invalid-comparison-operator.patch | 14 ++++++ 3 files changed, 60 insertions(+) create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch diff --git a/gnu/local.mk b/gnu/local.mk index 68a02d10b5..aa50fc0465 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ + %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 109133ba8e..236fc84077 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2806,6 +2806,51 @@ (define-public liblo implementation of the Open Sound Control (@dfn{OSC}) protocol.") (license license:lgpl2.1+))) +(define-public rtosc + (package + (name "rtosc") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fundamental/rtosc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2")) + (patches + (search-patches + "rtosc-0.3.1-fix-invalid-comparison-operator.patch")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DPERF_TEST=ON" + "-DRTOSC_BUILD_SHARED_LIBS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-documentation + (lambda _ + (invoke "make" "rtosc-doc"))) + (add-after 'install 'install-documentation + (lambda _ + (copy-recursively "html" + (string-append #$output:doc + "/share/doc/rtosc/html"))))))) + (native-inputs + (list doxygen pkg-config ruby)) + (inputs + (list jack-1 + liblo + libx11 + mesa)) + (outputs (list "out" "doc")) + (home-page "https://fundamental-code.com/wiki/rtosc/") + (synopsis "Realtime Safe OSC packet serialization and dispatch") + (description + "RtOsc is a realtime safe library for handling OSC messages.") + (license license:expat))) + (define-public rtaudio (package (name "rtaudio") diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch new file mode 100644 index 0000000000..925e39e9a1 --- /dev/null +++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch @@ -0,0 +1,14 @@ +This patch fixes the unknown version comparison operator + +diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake +index 0d8fda2..edbcb3a 100644 +--- a/librtosc-cpp.pc.cmake ++++ b/librtosc-cpp.pc.cmake +@@ -9,6 +9,6 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: rtosc_cpp + Description: rtosc_cpp - a realtime safe open sound control serialization and dispatch system for C++ + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ +-Requires: librtosc == @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ ++Requires: librtosc = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Libs: -L${libdir} -lrtosc -lrtosc-cpp + Cflags: -I${includedir} From patchwork Wed May 3 23:02:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49772 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 28ACF27BBEA; Thu, 4 May 2023 00:03:21 +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=ham 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 B9DAC27BBE9 for ; Thu, 4 May 2023 00:03:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puLV2-0000ZE-Hh; Wed, 03 May 2023 19:03:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puLV0-0000XJ-JO for guix-patches@gnu.org; Wed, 03 May 2023 19:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puLV0-00035c-AZ for guix-patches@gnu.org; Wed, 03 May 2023 19:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puLV0-0001Jk-5c for guix-patches@gnu.org; Wed, 03 May 2023 19:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH 4/5] gnu: Add mruby-zest. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2023 23:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831549525022 (code B ref 63254); Wed, 03 May 2023 23:03:02 +0000 Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:02:32 +0000 Received: from localhost ([127.0.0.1]:48054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLUV-0001Iv-CB for submit@debbugs.gnu.org; Wed, 03 May 2023 19:02:31 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:16199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLUT-0001Ij-LN for 63254@debbugs.gnu.org; Wed, 03 May 2023 19:02:30 -0400 Date: Wed, 03 May 2023 23:02:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1683154943; x=1683414143; bh=FlcN0O1JruygbfCCuOQU/isMsQECH8HP6L9PeDdXuzc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=kwu1CHeGic95UFgEbpBaLLbNA6qh8FyQehDj5mMPmdG5SbmsSPneS2UzZv/OHDRkF /AyWKxMITGPFIgl/4Sb9OPKYmmHNEMVGOiAsYETLDbRPORKI+Tyc5yPKDOpStOkjzR vB/Zr6MN89vpb1/3F+Nd5yiQq0IpcW+ag6YgVTRf7UaSCa9eQfD+dDMUCvJFoU9XbU gAJkwjwWSMXYLFSk2apIMznIjrhuv/vpcGkKzQYdtVUMgBwUwH/5FS5G+dfEQMZDxb Z3RvwPdCr6USfF0JQdB+vvNX1h3bXaauSgHe+mqpSMt/q/sKOcCe/N+3TBh7rgEiC4 xJEQRfWt4tEvQ== Message-ID: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mruby-xyz.scm: New file. * gnu/packages/local.mk: Register the file. --- gnu/local.mk | 1 + gnu/packages/mruby-xyz.scm | 176 +++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 gnu/packages/mruby-xyz.scm diff --git a/gnu/local.mk b/gnu/local.mk index aa50fc0465..6f213b2e7f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -436,6 +436,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/mpd.scm \ %D%/packages/mp3.scm \ %D%/packages/mpi.scm \ + %D%/packages/mruby-xyz.scm \ %D%/packages/multiprecision.scm \ %D%/packages/music.scm \ %D%/packages/musl.scm \ diff --git a/gnu/packages/mruby-xyz.scm b/gnu/packages/mruby-xyz.scm new file mode 100644 index 0000000000..08e7268f14 --- /dev/null +++ b/gnu/packages/mruby-xyz.scm @@ -0,0 +1,176 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages mruby-xyz) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages audio) + #:use-module (gnu packages bash) + #:use-module (gnu packages fonts) + #:use-module (gnu packages gl) + #:use-module (gnu packages libevent) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) + #:use-module (gnu packages xorg)) + +(define-public 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) + ;; Cloning recursively for the required mruby gems and also + ;; for these packages: + ;; "mruby": for building "mruby" with the provided + ;; "build_config.rb". + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dz4zv1km9805lji2q2qqdd8s8hgfd723dxdzcivbhm612szm1mc")) + (modules '((guix build utils))) + (snippet + ;; This packages contains a custom "pugl". Replacing it with the + ;; system "pugl" fails to build. + ;; Delete bundled "nanovg" and "rtosc". + '(with-directory-excursion "deps" + (for-each delete-file-recursively + (list "libuv" "nanovg" "rtosc")))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + "CONFIG_SHELL=bash") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Do not compile "nanovg" again and use system "nanovg". + (substitute* "Makefile" + (("cd deps/nanovg") "#cd deps/nanovg") + (("\\$\\(AR\\) rc deps/libnanovg\\.a") + "#$(AR) rc deps/libnanovg.a") + (("\\./deps/libnanovg\\.a") + "-lnanovg") + (("cd deps/libuv") "#cd deps/libuv") + (("\\./deps/libuv/\\.libs/libuv\\.a") + "-luv") + (("\\./deps/libuv/\\.libs/libuv-win\\.a") + "-luv-win")) + (substitute* "build_config.rb" + (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libnanovg\\.a") + "-lnanovg") + (("#\\{`pwd`\\.strip\\}/\\.\\./deps/libuv\\.a") + "-luv") + (("cc\\.include_paths.*\\./deps/nanovg/.*$") + "#") + (("cc\\.include_paths.*\\./deps/libuv/.*$") + "#")) + (substitute* "deps/mruby-nanovg/src/nvg_screenshot.c" + (("\\.\\./\\.\\./nanovg/.*/stb_image_write\\.h") + (search-input-file inputs "/example/stb_image_write.h"))) + ;; Use system "rtosc" headers. + (substitute* "src/mruby-widget-lib/src/gem.c" + (("\"\\.\\./\\.\\./\\.\\./deps/.*/rtosc\\.h\"") + "")) + ;; Fix missing fonts. + (substitute* + "src/mruby-widget-lib/mrblib/script.rb" + (("sans = \\[") + (string-append + "sans = [\"" + (search-input-file inputs + "/share/fonts/truetype/Roboto-Regular.ttf") + "\", ")) + (("bold = \\[") + (string-append + "bold = [\"" + (search-input-file inputs + "/share/fonts/truetype/Roboto-Bold.ttf") + "\", "))) + ;; Fix paths for zyn-fusion files. + (substitute* "src/osc-bridge/src/bridge.c" + (("fopen\\(\\\"schema/") + (string-append + "fopen(\"" #$output "/share/zyn-fusion/schema/"))) + (substitute* "test-libversion.c" + (("./libzest.so") + (string-append #$output "/lib/libzest.so"))) + (substitute* "src/mruby-widget-lib/src/api.c" + ((", \\\"\\./qml/") ", \"../share/zyn-fusion/qml/") + (("\\./qml/") + (string-append #$output "/share/zyn-fusion/qml"))))) + (replace 'install + (lambda _ + (rename-file "zest" "zyn-fusion") + (install-file "zyn-fusion" (string-append #$output "/bin")) + (install-file "libzest.so" (string-append #$output "/lib")) + (for-each + (lambda (folder) + (for-each + (lambda (file) + (install-file file + (string-append #$output "/share/zyn-fusion/qml"))) + (find-files folder "\\.qml$"))) + '("src/mruby-zest/qml" "src/mruby-zest/example")) + (install-file "src/osc-bridge/schema/test.json" + (string-append #$output "/share/zyn-fusion/schema")) + (install-file "completions/zyn-fusion" + (string-append + #$output "/share/bash-completion/completions"))))))) + (native-inputs + (list (package-source nanovg) ;for "stb_image_write.h" + pkg-config + ruby)) + (inputs + (list font-google-roboto + libuv + libx11 + mesa + ;; With the latest version of "nanovg" the contents are not + ;; displayed properly. + (let ((revision "0") + (commit "b83cf926525e7cea8d2483da2a75852b8c7b6d28")) + (package (inherit nanovg) + (version (git-version (package-version nanovg) revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/memononen/nanovg") + (commit commit))) + (sha256 + (base32 + "1zp355pw6xnb5mjarz67cxkglv7j1s0qzv705fz1wf0gl0sjhy8f")))))) + rtosc)) + (home-page "https://github.com/mruby-zest/mruby-zest-build") + (synopsis "Zyn-Fusion user interface") + (description + "This package provides user interface for Zyn-Fusion.") + (license + (list license:lgpl2.1)))) From patchwork Wed May 3 23:02:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49773 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 CBA5027BBE9; Thu, 4 May 2023 00:04:24 +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 107BF27BBE2 for ; Thu, 4 May 2023 00:04:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puLW7-0003dJ-HL; Wed, 03 May 2023 19:04:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puLVz-0003AD-Hi for guix-patches@gnu.org; Wed, 03 May 2023 19:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puLVy-0005PH-2A for guix-patches@gnu.org; Wed, 03 May 2023 19:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puLVx-0001Lf-Tz for guix-patches@gnu.org; Wed, 03 May 2023 19:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2023 23:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831549895102 (code B ref 63254); Wed, 03 May 2023 23:04:01 +0000 Received: (at 63254) by debbugs.gnu.org; 3 May 2023 23:03:09 +0000 Received: from localhost ([127.0.0.1]:48059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLV7-0001KD-4z for submit@debbugs.gnu.org; Wed, 03 May 2023 19:03:09 -0400 Received: from mail-40140.protonmail.ch ([185.70.40.140]:19197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puLV4-0001Ja-E6 for 63254@debbugs.gnu.org; Wed, 03 May 2023 19:03:07 -0400 Date: Wed, 03 May 2023 23:02:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=5m5pudrrbjg6bps65b26zurvjm.protonmail; t=1683154979; x=1683414179; bh=zHLhI/rLoZ1hDphi4RpT2FktTr2skmDrYhQEVenhIBo=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=j9mpCFEFpz4Tp+JXcKC7Kvpd1QAg0EtNbRvMyWTZ9OxM3uAUD6Wkvc/8dePELLtWA mLvsZuIkJlNz2Yh1XuG6PvELogqkwjbYWdYr3mDq2cRXFIH1YCT58xVNLwgL1Z67a8 AC0WiphehvSK4wUEYQDPj4dcj8DyCIh+jBX8TA3gEO9bRvELEdbSHk0q197X3LKvm9 MyNgbZSb5GA5rmISwPFJJ+bV3u/2YhqcTAhLFJ8Dx0h8FkwHs5g+gcE1tEE2nGY7Yj 4Nnc7R01qPlC3zMKB4lT6wQ38w0Mi0G9bsuTitjIoRkBu5b3HKk6j0vjDMFuwN9dVz srZhjwZwy1W2g== Message-ID: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From f454e2f8af61e9ab593fbf5cc3fdccf6d390ab7c Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 4 May 2023 00:49:01 +0200 Subject: [PATCH 5/5] gnu: zynaddsubfx: Switch to Zyn-Fusion interface. * gnu/packages/music.scm (zynaddsubfx)[source]: Add a patches. [arguments]: Add configure flags and patch-paths phase. [inputs]: Remove ntk and add rtosc and mruby-zest. [home-page]: Change home-page. * gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/music.scm | 28 ++++- .../zynaddsubfx-3.0.6-system-rtosc.patch | 106 ++++++++++++++++++ 3 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6f213b2e7f..8a20f54e9f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2072,6 +2072,7 @@ dist_patch_DATA = \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-system-paths.patch \ + %D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 446580dc52..ec19318b6f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -157,6 +157,7 @@ (define-module (gnu packages music) #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages mpd) + #:use-module (gnu packages mruby-xyz) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) #:use-module (gnu packages pcre) @@ -3175,10 +3176,18 @@ (define-public zynaddsubfx version "/zynaddsubfx-" version ".tar.bz2")) (sha256 (base32 - "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb")))) + "1bkirvcg0lz1i7ypnz3dyh218yhrqpnijxs8n3wlgwbcixvn1lfb")) + (patches + (search-patches + "zynaddsubfx-3.0.6-system-rtosc.patch")))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags `("-DGuiModule=zest" + ,(string-append "-DZYN_DATADIR=" + (assoc-ref %outputs "out") + "/share/zynaddsubfx") + "-DZYN_SYSTEM_RTOSC=ON") + #:phases (modify-phases %standard-phases ;; Move SSE compiler optimization flags from generic target to ;; athlon64 and core2 targets, because otherwise the build would fail @@ -3188,10 +3197,19 @@ (define-public zynaddsubfx (substitute* "src/CMakeLists.txt" (("-msse -msse2 -mfpmath=sse") "") (("-march=(athlon64|core2)" flag) - (string-append flag " -msse -msse2 -mfpmath=sse")))))))) + (string-append flag " -msse -msse2 -mfpmath=sse"))))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/main.cpp" + (("\\./zyn-fusion") + (search-input-file inputs "/bin/zyn-fusion"))) + (substitute* "src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" + (("\\./libzest\\.so") + (search-input-file inputs "/lib/libzest.so")))))))) (inputs (list liblo - ntk + rtosc + mruby-zest mesa alsa-lib jack-1 @@ -3203,7 +3221,7 @@ (define-public zynaddsubfx (native-inputs (list pkg-config ruby)) - (home-page "https://zynaddsubfx.sf.net/") + (home-page "https://zynaddsubfx.sourceforge.io/") (synopsis "Software synthesizer") (description "ZynAddSubFX is a feature heavy realtime software synthesizer. It offers diff --git a/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch new file mode 100644 index 0000000000..edf22c389b --- /dev/null +++ b/gnu/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch @@ -0,0 +1,106 @@ +Adding the option ZYN_SYSTEM_RTOSC to let the use of the system provided RtOsc +instead of using the bundled one. + +--- a/CMakeLists.txt 2022-01-22 02:46:21.000000000 +0100 ++++ b/CMakeLists.txt 2023-05-03 23:17:58.411667901 +0200 +@@ -10,24 +10,34 @@ + add_definitions(-DZYN_DATADIR="${ZYN_DATADIR}") + endif() + ++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" OFF) ++ + #Include RTOSC +-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") +- message(STATUS "RTOSC NOT FOUND") +- message(STATUS "Attempting to checkout submodule") +- find_package(Git REQUIRED) +- execute_process(COMMAND git submodule update --init --recursive) ++if(ZYN_SYSTEM_RTOSC) ++ include(FindPkgConfig) ++ pkg_check_modules(RTOSC REQUIRED librtosc) ++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp) ++ include_directories(${RTOSC_INCLUDE_DIR}) ++ message(STATUS "Found system provided librtosc and librtosc-cpp...") ++else() + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") +- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" +- "please check file permissions and your network") ++ message(STATUS "RTOSC NOT FOUND") ++ message(STATUS "Attempting to checkout submodule") ++ find_package(Git REQUIRED) ++ execute_process(COMMAND git submodule update --init --recursive) ++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") ++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" ++ "please check file permissions and your network") ++ endif() ++ else() ++ message(STATUS "Found Rtosc Submodule...") + endif() +-else() +- message(STATUS "Found Rtosc Submodule...") +-endif() + +-set(RTOSC_NO_INSTALL TRUE) +-include("rtosc/cmake/ColorMessage.cmake") +-add_subdirectory(rtosc) +-include_directories(rtosc/include) ++ set(RTOSC_NO_INSTALL TRUE) ++ include("rtosc/cmake/ColorMessage.cmake") ++ add_subdirectory(rtosc) ++ include_directories(rtosc/include) ++endif() + + enable_testing() + include(CTestConfig.cmake) +--- a/src/CMakeLists.txt 2022-01-22 02:46:21.000000000 +0100 ++++ b/src/CMakeLists.txt 2023-05-03 23:17:58.411667901 +0200 +@@ -575,13 +575,27 @@ + set(PTHREAD_LIBRARY pthread) + endif() + +-target_link_libraries(zynaddsubfx_core +- ${ZLIB_LIBRARIES} +- ${FFTW3F_LIBRARIES} +- ${MXML_LIBRARIES} +- ${OS_LIBRARIES} +- ${PTHREAD_LIBRARY} +- rtosc rtosc-cpp) ++if(ZYN_SYSTEM_RTOSC) ++ target_link_libraries(zynaddsubfx_core ++ ${ZLIB_LIBRARIES} ++ ${FFTW3F_LIBRARIES} ++ ${MXML_LIBRARIES} ++ ${OS_LIBRARIES} ++ ${PTHREAD_LIBRARY} ++ ${RTOSC_LIBRARIES} ++ ${RTOSC_CPP_LIBRARIES} ++ ) ++else() ++ target_link_libraries(zynaddsubfx_core ++ ${ZLIB_LIBRARIES} ++ ${FFTW3F_LIBRARIES} ++ ${MXML_LIBRARIES} ++ ${OS_LIBRARIES} ++ ${PTHREAD_LIBRARY} ++ rtosc ++ rtosc-cpp ++ ) ++endif() + + if(IwyuErr) + message (STATUS "Include what you use: ${IwyuErr}") + + +When ZYN_SYSTEM_RTOSC is ON, port-checker file is not available and the test +fails. + +--- a/src/Tests/CMakeLists.txt 2022-01-22 02:46:21.000000000 +0100 ++++ b/src/Tests/CMakeLists.txt 2023-05-04 00:19:01.635383149 +0200 +@@ -65,7 +65,6 @@ + + if(LIBLO_FOUND) + cp_script(check-ports.rb) +- add_test(PortChecker check-ports.rb) + endif() + add_executable(save-osc SaveOSC.cpp) + target_link_libraries(save-osc