From patchwork Thu Nov 30 10:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20189 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 356E627BBE9; Thu, 30 Nov 2023 10:34:21 +0000 (GMT) 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,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 9472827BBE2 for ; Thu, 30 Nov 2023 10:34:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMp-0004Ei-Rn; Thu, 30 Nov 2023 05:33:59 -0500 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 1r8eMl-0004Dd-Oy for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMk-0004BU-BR for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMs-0003pH-Am for guix-patches@gnu.org; Thu, 30 Nov 2023 05:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 1/7] gnu: asio: Update to 1.28.0. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Sughosha , Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038514574 (code B ref 66870); Thu, 30 Nov 2023 10:34:02 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:05 +0000 Received: from localhost ([127.0.0.1]:52373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLx-0003mq-Ff for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:05 -0500 Received: from layka.disroot.org ([178.21.23.139]:45342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLu-0003m9-VO for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:04 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A2EB744DE2; Thu, 30 Nov 2023 11:32:53 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0k1u9Im5i9Lo; Thu, 30 Nov 2023 11:32:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340372; bh=cNE7Spvil9QdakcWhASs0YhTSdj0Kau4aNiVaT6HxuA=; h=From:To:Cc:Subject:Date; b=hVvVfhw9NaSDL8XL/oYOr1lb+EquLruuMCpYBwJZsapIAYvW7Q6E679ZNE/C5uuBk jgD2i24b8V06Jx0JTOmcPPuaMyU0TGQS/ZQurrY2WMuWCWR0sI+jX0X+BWMEMJRqc6 XL4JsWo5QnevOeyktvCs1LJqKP4WFOgoGy0RTC804OZ+MCyJ8efX5zJjNbxqmblmWs pQ3NZkyc9WPffrO6GuGJPNDfMIX0MGP3jAYiwGH6L+TAUq9z+eC1K7ZhlphvL+xFFt RDho4kqXyyZKRbme+h9AHVEODk7/LjIdsCtjuh/ijrCQiNWZHSv9gyh4G34wIjN7jr cY5XFJhK58WRQ== Date: Thu, 30 Nov 2023 11:32:22 +0100 Message-ID: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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: Sughosha * gnu/packages/networking.scm (asio): Update to 1.28.0. [home-page]: Fix homepage. Change-Id: I7c21512a60a2621911d856d53cef14638e4d2afb --- gnu/packages/networking.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6b415076e8..bfd53e0a3f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3381,14 +3381,14 @@ (define-public can-utils (define-public asio (package (name "asio") - (version "1.22.2") + (version "1.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asio/asio/" - version " (Stable)/asio-" version ".tar.bz2")) + version " (Stable)/asio-" version ".tar.gz")) (sha256 - (base32 "0v5w9j4a02j2rkc7mrdj3ms0kfpqbgq2ipkixlz2l0p8xs0vfsvp")))) + (base32 "15yavn07m6fasf0lrxljx3p79zi23mzn0g0fhggrnngyqqyaam78")))) (build-system gnu-build-system) (inputs (list boost openssl)) @@ -3397,7 +3397,7 @@ (define-public asio (list (string-append "--with-boost=" (assoc-ref %build-inputs "boost")) (string-append "--with-openssl=" (assoc-ref %build-inputs "openssl"))))) - (home-page "https://think-async.com/Asio") + (home-page "https://think-async.com/Asio/") (synopsis "C++ library for ASynchronous network I/O") (description "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent From patchwork Thu Nov 30 10:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20191 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 287D227BBE2; Thu, 30 Nov 2023 10:34:37 +0000 (GMT) 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,MAILING_LIST_MULTI,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 4029C27BBEA for ; Thu, 30 Nov 2023 10:34:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMq-0004Ee-51; Thu, 30 Nov 2023 05:34:00 -0500 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 1r8eMl-0004Db-Nk for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMj-0004BR-RQ for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMr-0003p9-RC for guix-patches@gnu.org; Thu, 30 Nov 2023 05:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 2/7] gnu: Add bitsery. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Sughosha , Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038514563 (code B ref 66870); Thu, 30 Nov 2023 10:34:01 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:05 +0000 Received: from localhost ([127.0.0.1]:52371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLx-0003mn-3w for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:05 -0500 Received: from layka.disroot.org ([178.21.23.139]:45354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLu-0003mC-VM for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:04 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 29EFB41A5F; Thu, 30 Nov 2023 11:32:54 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I7tkpHOAxdmS; Thu, 30 Nov 2023 11:32:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340373; bh=7ymlqZ2NmDPxZl8QMiNiB/osHFyN3CwkmBZygx3gbqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=emK9kE1h5viRvIvFw5HduKZWMUmFJAxfw2jhbfrjyZYjZ834UKmFjJAkqQi9MHVRg kN7humOuMCnDf4LAaHWUYNEbO60rPtxNYfaJI5vD+u+xgEj0PIyEvtN7nPY3/FJH+X MowP+R5gTgSiy++InX4d8fpZGSM+IB279J3Nus8c3Kz4nvO28FOairlngPCXJr1w1T 3SOniJpEwpsb+eJRb9y6foHSpSGR8LBq1S41AlMi9cmt2zZCdlE+UsAMLkQ+JfgzOT 5Hzl6jy6Hi3Cuzfn/0GCBcbiM97ZWNaueermI0EkJUPyB0utWVxvMrtcq/pO9Wa7Cc 07CtBZ+o635UA== Date: Thu, 30 Nov 2023 11:32:23 +0100 Message-ID: In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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: Sughosha * gnu/packages/cpp.scm (bitsery): New variable. --- gnu/packages/cpp.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5e35a03254..16fd5bcec5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2319,6 +2319,30 @@ (define-public gulrak-filesystem (home-page "https://github.com/gulrak/filesystem") (license license:expat))) +(define-public bitsery + (package + (name "bitsery") + (version "5.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fraillt/bitsery") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hv2fya7w53bfhlk79b1qnjg1qy076s8kvg22sfdq05bh0hxqrxf")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DBITSERY_BUILD_TESTS=ON"))) + (native-inputs (list googletest)) + (synopsis "Header only C++ binary serialization library") + (description "This package provides header only C++ binary serialization +library. It is designed around the networking requirements for real-time data +delivery, especially for games.") + (home-page "https://github.com/fraillt/bitsery") + (license license:expat))) + (define-public cpp-mustache (package (name "cpp-mustache") From patchwork Thu Nov 30 10:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20195 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 A7EE827BBE2; Thu, 30 Nov 2023 10:34:55 +0000 (GMT) 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,MAILING_LIST_MULTI,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 3DFA227BBE9 for ; Thu, 30 Nov 2023 10:34:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMr-0004FP-HH; Thu, 30 Nov 2023 05:34:01 -0500 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 1r8eMl-0004Dc-Ob for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMl-0004BZ-9k for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMt-0003pV-A1 for guix-patches@gnu.org; Thu, 30 Nov 2023 05:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 3/7] gnu: Add function2. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Sughosha , Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038614591 (code B ref 66870); Thu, 30 Nov 2023 10:34:03 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:06 +0000 Received: from localhost ([127.0.0.1]:52377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLy-0003n9-4x for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:06 -0500 Received: from layka.disroot.org ([178.21.23.139]:53208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLv-0003mH-EA for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:04 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AE27344DD2; Thu, 30 Nov 2023 11:32:54 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lp-p_sHLSkcu; Thu, 30 Nov 2023 11:32:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340373; bh=UJtIrhw6zRrKmHHkUUSlgZJN+48Ujl9j3t/GuQW1yXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kjbAwW4m1OIkvNMvuWVm12N0FxnxA5JILo6fSiire1LyKH5zEb5JieU+JiSZRswp0 anI0wLrs4yyPZHTjvVsZXH9GY4hHvI4AwYPXiIZBBNMbY9eQm8if3zVOsH8DT8fdm6 u9e31zDctJOPdENo649Xb52xO5m2/Bv1VLRjBnOSz0hlVmVxntQ8FMLNlN8kMweU/D YHRaA4JCuknkLAZfhzKYxqo3de9GwHMHZWxpbm+44fr81DwFKzeMJsJlfxcQhfAfgs t+6uvBHpffZuIpVce6ILHr/PcmGOZXpSeNX1TRUac1E8r7L/VcW5OHfaDUfKsw1Ct3 2GpWMwmtkgSWQ== Date: Thu, 30 Nov 2023 11:32:24 +0100 Message-ID: In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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: Sughosha * gnu/packages/cpp.scm (function2): New variable. Change-Id: I29eb928aa943fa6b796d699271ca523075d44d38 --- gnu/packages/cpp.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 16fd5bcec5..24e519b10b 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2343,6 +2343,36 @@ (define-public bitsery (home-page "https://github.com/fraillt/bitsery") (license license:expat))) +(define-public function2 + (package + (name "function2") + (version "4.2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Naios/function2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15k8i872s2jpwbpxfq42lr96q9wplvr8gjs2msf5i4ylyp846dgf")))) + (build-system cmake-build-system) + ;; The test size_match_layout fails on i586/i686. For more info: + ;; https://github.com/Naios/function2/issues/57 + (arguments + (list #:tests? #f)) + (synopsis "Improved implementations of std::function") + (description "This package provides the following implementations of +std::function: +@itemize +@item copyable fu2::function +@item move-only fu2::unique_function (capable of holding move only types) +@item non-owning fu2::function_view (capable of referencing callables in a non +owning way) +@end itemize") + (home-page "https://naios.github.io/function2/") + (license license:boost1.0))) + (define-public cpp-mustache (package (name "cpp-mustache") From patchwork Thu Nov 30 10:32:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20194 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 872C227BBEB; Thu, 30 Nov 2023 10:34:53 +0000 (GMT) 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,MAILING_LIST_MULTI,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 3BA2D27BBE2 for ; Thu, 30 Nov 2023 10:34:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMr-0004FO-GJ; Thu, 30 Nov 2023 05:34:01 -0500 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 1r8eMm-0004Dz-Dd for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMl-0004Bq-P6 for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMt-0003pe-Pw for guix-patches@gnu.org; Thu, 30 Nov 2023 05:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 4/7] gnu: Add tomlplusplus. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Gabriel Wicki , Sughosha Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038614598 (code B ref 66870); Thu, 30 Nov 2023 10:34:03 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:06 +0000 Received: from localhost ([127.0.0.1]:52379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLy-0003nI-Gl for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:06 -0500 Received: from layka.disroot.org ([178.21.23.139]:53220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLv-0003mI-S8 for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:04 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3B32A44DE7; Thu, 30 Nov 2023 11:32:55 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vzTHRd_gcmXI; Thu, 30 Nov 2023 11:32:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340374; bh=+1Vjn0E0V6aSieyq2GGrl35I9SbKH45gXmFQNGdoeSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OOGlRFNbuEXW9QnL89BMNB6TinzXl1WoUzTu3hthq7jaRSs0tekJXYDn5XKCXENI1 Efu3qM5+59Jb1v01TsdMLOG3WtvUXdEfEsF2cVuuQH8zFwBKw0EafW0pEu34RN0SoB NnHtfvppBEZ+8/T6UQsmN+HLTcvl3Y2OL+zQAg9nBw/0ykVTB7RpCsdz9PIjK1wbiF SBWrCrBWuDuh6KOIm3ZSzlJUBdWPdm6pzil6guoUzt3qbO2yAitfzF6YknRrPe2NhQ lR5nm5dz/HJSwXTpMhRvYtjMEKxYX4bYU47CbtPzO5EIW64blTP2Eemzvdg14Ks5t/ ZMWwJOezB3XJQ== Date: Thu, 30 Nov 2023 11:32:25 +0100 Message-ID: <4a63919d60c7b947d990be5faf4d42ccf3d71107.1701340263.git.sughosha@disroot.org> In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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/cpp.scm (tomlplusplus): New variable. Change-Id: I7c12b76fe135cd22b54a56560aac699e452009bb --- gnu/packages/cpp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 24e519b10b..272127737b 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -78,6 +78,7 @@ (define-module (gnu packages cpp) #:use-module (gnu packages build-tools) #:use-module (gnu packages c) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -2373,6 +2374,27 @@ (define-public function2 (home-page "https://naios.github.io/function2/") (license license:boost1.0))) +(define-public tomlplusplus + (package + (name "tomlplusplus") + (version "3.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marzer/tomlplusplus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hvbifzcc97r9jwjzpnq31ynqnj5y93cjz4frmgddnkg8hxmp6w7")))) + (build-system meson-build-system) + (native-inputs (list cmake-minimal)) + (synopsis "Header-only TOML config file parser and serializer for C++17") + (description "This package provides Header-only TOML config file parser and +serializer for C++17.") + (home-page "https://marzer.github.io/tomlplusplus/") + (license license:expat))) + (define-public cpp-mustache (package (name "cpp-mustache") From patchwork Thu Nov 30 10:32:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20192 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 A9E6C27BBEA; Thu, 30 Nov 2023 10:34:42 +0000 (GMT) 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,MAILING_LIST_MULTI,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 F127427BBE2 for ; Thu, 30 Nov 2023 10:34:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMu-0004GR-2V; Thu, 30 Nov 2023 05:34:04 -0500 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 1r8eMl-0004Dj-Sm for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMl-0004Bf-KF for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMs-0003pO-Ra; Thu, 30 Nov 2023 05:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 5/7] gnu: Add clap. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Gabriel Wicki , Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038614582 (code B ref 66870); Thu, 30 Nov 2023 10:34:02 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:06 +0000 Received: from localhost ([127.0.0.1]:52375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLx-0003n6-SN for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:06 -0500 Received: from layka.disroot.org ([178.21.23.139]:53232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLw-0003mP-B2 for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:04 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BECFE44DF4; Thu, 30 Nov 2023 11:32:55 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yJ-zvykiFPvO; Thu, 30 Nov 2023 11:32:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340374; bh=4CYY7eNBupgKWbpdGorqQjT0kHhljzSHiQWGuvfsNDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JTn1jkpAn7FgK0ByDhi6SeS7FROg01jRaNVnG8EylcKeBWorDN2W94Ar4uTZHEkKf KJ8IqMQLBtRBC80kC5qujYw5MAlMB3s57+BcsLxgVXlTb1gXHd0KSaBEIDc2B10Zo3 RXgieEHnJEyLi96J1g1/UpaBu7ivW5Ps31bHo1fXCFLxYjtJGhWr90nkrfpAM7n8UU mBNOWR0XBNlh574NJpBsFAiVqklgY5ch7NOFF0gDeDw8V/sWZAHH9Lo/h3rvhfs6MU MjKLjpgtT+vpASrkwyPOa+Hjbz0GFatRZorDrV/vYUvfcRkOjyUdBD5qkO6DBalj8o dxMd4lMQAwfCQ== Date: Thu, 30 Nov 2023 11:32:26 +0100 Message-ID: <3ea9ec83b90d6d852065c7810ad5d0907579dc51.1701340263.git.sughosha@disroot.org> In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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 (clap): New variable. Change-Id: I595adff236eacaf2934f4649e2f27a367f33d0ae --- gnu/packages/audio.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e4fe4c2da7..e964c74438 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2715,6 +2715,28 @@ (define-public jalv plugin function as a JACK application.") (license license:isc))) +(define-public clap + (package + (name "clap") + (version "1.1.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/free-audio/clap") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0skn3cvh7zs173v3i6ywdmddqzrhxvivwdisvmqc6hvq594f8z80")))) + (build-system cmake-build-system) + (synopsis "Audio Plugin API") + (description + "CLAP stands for CLever Audio Plugin. It is an audio plugin ABI which +defines a standard for Digital Audio Workstations and audio plugins to work +together.") + (home-page "https://cleveraudio.org/") + (license license:expat))) + (define-public ladspa (package (name "ladspa") From patchwork Thu Nov 30 10:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20190 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 0B10127BBEC; Thu, 30 Nov 2023 10:34:33 +0000 (GMT) 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,MAILING_LIST_MULTI,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 2FF9E27BBE2 for ; Thu, 30 Nov 2023 10:34:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMq-0004Eq-4e; Thu, 30 Nov 2023 05:34:00 -0500 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 1r8eMm-0004E6-Mn for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMm-0004C5-Db for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMu-0003pl-6Q; Thu, 30 Nov 2023 05:34:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 6/7] gnu: Add clap-1.1.7. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Gabriel Wicki , Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134038714604 (code B ref 66870); Thu, 30 Nov 2023 10:34:04 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:07 +0000 Received: from localhost ([127.0.0.1]:52382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLy-0003nP-Tc for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:07 -0500 Received: from layka.disroot.org ([178.21.23.139]:53236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLw-0003mX-RE for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:05 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4A32844E13; Thu, 30 Nov 2023 11:32:56 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FBjSOj2qAZN6; Thu, 30 Nov 2023 11:32:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340375; bh=1Cx9w2U4VVYFe9+7UfUytN3426Pug/nAU/ZwDJc+1OI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EiNaY3c9DFo0uh/Sg3EmHRFUqRUMPod7TmNVlr20SzBma0lSyGmLcEAjetH7iqJ2X uESy6G/cO2u9TNUrkvXZzedfaJa5es09OBzQBLH1ZV5kQK8X48PktyLTZGgZbyCc2f qWdrjbDf07qnlfA8n5HD7fKf3LyarMzsd499E/Z9OH8r3aqhgvlCsdhPpjMXTmSp5y F8R0KOVByWgfr+dcWWYfmGuYgSb92v9A5ztq5WEQ51by59UbzrQyZY5GPHTTPiQdTn RiH9gvWycBfrPga2We4A9kduDzxbogqOlgVRMWo9/qWKOA70+f29eruCBty+2wSRdq OBLkBSLWo5kag== Date: Thu, 30 Nov 2023 11:32:27 +0100 Message-ID: In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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 (clap-1.1.7): New variable. Change-Id: Iae9f11784279fc7a73087d2009a6d7e280fe80b8 --- gnu/packages/audio.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e964c74438..6e1da4c288 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2737,6 +2737,20 @@ (define-public clap (home-page "https://cleveraudio.org/") (license license:expat))) +(define-public clap-1.1.7 + (let ((version "1.1.7")) + (package/inherit clap + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/free-audio/clap") + (commit version))) + (file-name (git-file-name "clap" version)) + (sha256 + (base32 + "1afjvllmzf2xmrpy8mcxk7zhii93b447ciaqw9lkj2wh9z217hsr"))))))) + (define-public ladspa (package (name "ladspa") From patchwork Thu Nov 30 10:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 20193 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 0426827BBEA; Thu, 30 Nov 2023 10:34:53 +0000 (GMT) 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,MAILING_LIST_MULTI,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 B03CE27BBE2 for ; Thu, 30 Nov 2023 10:34:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8eMr-0004FX-NL; Thu, 30 Nov 2023 05:34:01 -0500 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 1r8eMn-0004EA-9M for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8eMm-0004CB-MO for guix-patches@gnu.org; Thu, 30 Nov 2023 05:33:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8eMu-0003pu-Lg; Thu, 30 Nov 2023 05:34:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH v3 7/7] gnu: Add yabridge. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 10:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66870@debbugs.gnu.org Cc: Gabriel Wicki , Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.170134039514626 (code B ref 66870); Thu, 30 Nov 2023 10:34:04 +0000 Received: (at 66870) by debbugs.gnu.org; 30 Nov 2023 10:33:15 +0000 Received: from localhost ([127.0.0.1]:52384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eM6-0003no-6k for submit@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:15 -0500 Received: from layka.disroot.org ([178.21.23.139]:53252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8eLy-0003nE-G4 for 66870@debbugs.gnu.org; Thu, 30 Nov 2023 05:33:07 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E48E641A5F; Thu, 30 Nov 2023 11:32:57 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MnWV_zB_QV4T; Thu, 30 Nov 2023 11:32:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1701340376; bh=tH3uCOuCJ8aAeBWYxssoc/ORy5tzriGwkfnLtrji4Fo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OTxzPaSaVQ24bfyr/mEGOM/PsJgK+lojedAvAG4tNsP93Ef2IgJfXAZYMVs4BvfVJ jtbAC4nEl/wpFLjZEWFHbQPRd1zOpg8z0SwJitWXSELtfUN5mPO4ubci5xAmsAqviX MgYm+4i0CnfZojeUDf8cYh62SpbzUxKWMBk6kBtDd04WZvGmDhY1FZoq7q2YoYx318 q5vNHtz267F0NOokaLvp6VOP3DGEW3Kkq9FNwUkizR3hw6sKwfbL2J+Sbo3fiuAskC 2/bIIq2vlp51T4dXRxa/9Tvy33HMpv0nWNApFKslkkzupWhrTV755gfQpgBt/rSdWm CugQTOFqbVDCQ== Date: Thu, 30 Nov 2023 11:32:28 +0100 Message-ID: <0dd723d14d26f8ecb64fe829a046452e2189b69b.1701340263.git.sughosha@disroot.org> In-Reply-To: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> References: <6f5cc74f73fb4f4a28c2e40b525058f2b3005ad0.1701340263.git.sughosha@disroot.org> 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 (yabridge): New variable. * gnu/packages/patches/yabridge-5.0.4-dependencies.patch: New file. * gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch: New file. * gnu/local.mk: Register the patch files. Change-Id: Ic7e5fdc3b24349a01ed9b301d0a353e55c4479b8 --- gnu/local.mk | 2 + gnu/packages/audio.scm | 88 ++++++++ ...3sdk-3.7.7-allow-winelib-compilation.patch | 191 ++++++++++++++++++ .../patches/yabridge-5.0.4-dependencies.patch | 36 ++++ 4 files changed, 317 insertions(+) create mode 100644 gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch create mode 100644 gnu/packages/patches/yabridge-5.0.4-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index a8142bb0f2..c93a7b3659 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2119,6 +2119,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ + %D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-7-gcc-10-compat.patch \ @@ -2170,6 +2171,7 @@ dist_patch_DATA = \ %D%/packages/patches/xterm-370-explicit-xcursor.patch \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ + %D%/packages/patches/yabridge-5.0.4-dependencies.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6e1da4c288..f842548c93 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -73,7 +73,9 @@ (define-module (gnu packages audio) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -136,6 +138,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages vim) ;xxd #:use-module (gnu packages web) #:use-module (gnu packages webkit) + #:use-module (gnu packages wine) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) @@ -5941,6 +5944,91 @@ (define-public mbelib (license (list license:bsd-3 ; test/ framework license:isc))))) ; the rest +(define-public yabridge + (package + (name "yabridge") + (version "5.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/yabridge") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ayl706nv67jkixbrh9z7225gdwg2s4rzndx77761x33mk6by7a8")) + (patches + (search-patches + "yabridge-5.0.4-dependencies.patch")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags + #~(list (string-append "--cross-file=" #$source "/cross-wine.conf")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-vst3-subproject + (lambda* (#:key inputs #:allow-other-keys) + (symlink (assoc-ref inputs "vst3sdk") "subprojects/vst3"))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/chainloader/utils.cpp" + (("\"/usr/local/lib64\",") + (string-append "\"/usr/local/lib64\",\n\"" + #$output "/lib\","))))) + (replace 'install + (lambda _ + (for-each + (lambda (file) + (install-file file (string-append #$output "/bin"))) + (find-files "." "-host\\.exe(|\\.so)$")) + (for-each + (lambda (file) + (install-file file (string-append #$output "/lib"))) + (find-files "." "libyabridge"))))))) + (native-inputs + ;; NOTE: Use the latest clap version with the next update of yabrigde. + `(("clap" ,clap-1.1.7) + ("cmake-minimal" ,cmake-minimal) + ("function2" ,function2) + ("gulrak-filesystem" ,gulrak-filesystem) + ("pkg-config" ,pkg-config) + ("tomlplusplus" ,tomlplusplus) + ;; This is VST3 SDK v3.7.7_build_19 with the documentation and VSTGUI + ;; submodules removed and a dummy `meson.build` file that just lists all + ;; source files. + ("vst3sdk" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/vst3sdk") + (commit (string-append "v3.7.7_build_19-patched")) + ;; Required for vst3_base, vst3_pluginterfaces, + ;; and vst3_public_sdk. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09axvpshwbf5061kcbl26v74dcmwxmgmlxb15b75bnqbh0zcghrf")) + (patches + (search-patches + "vst3sdk-3.7.7-allow-winelib-compilation.patch")))))) + (inputs + (list asio + bitsery + dbus + libxcb + wine64)) + (supported-systems + (package-supported-systems wine64)) + (home-page "https://github.com/robbert-vdh/yabridge") + (synopsis "Implementation of Windows VST2, VST3 and CLAP plugin APIs") + (description + "@code{yabridge} is Yet Another way to use Windows audio plugins. It +supports using Windows VST2, VST3, and CLAP plugins in plugin hosts as if they +were native plugins, with optional support for plugin groups to enable +inter-plugin communication for VST2 plugins and quick startup times.") + (license license:gpl3+))) + (define-public ableton-link (package (name "ableton-link") diff --git a/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch b/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch new file mode 100644 index 0000000000..43639f978f --- /dev/null +++ b/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch @@ -0,0 +1,191 @@ +This patch is taken from yabridge project: +https://github.com/robbert-vdh/yabridge. + +Submodule base contains modified content +diff --git a/base/source/fdebug.cpp b/base/source/fdebug.cpp +index b1d1dcc..9093022 100644 +--- a/base/source/fdebug.cpp ++++ b/base/source/fdebug.cpp +@@ -117,8 +117,6 @@ bool AmIBeingDebugged () + #if _MSC_VER + #include + #endif +-#define vsnprintf _vsnprintf +-#define snprintf _snprintf + + #elif SMTG_OS_MACOS + #include +Submodule pluginterfaces contains modified content +diff --git a/pluginterfaces/base/fstrdefs.h b/pluginterfaces/base/fstrdefs.h +index 848e8ee..8846d31 100644 +--- a/pluginterfaces/base/fstrdefs.h ++++ b/pluginterfaces/base/fstrdefs.h +@@ -22,6 +22,16 @@ + /** string methods defines unicode / ASCII */ + //---------------------------------------------------------------------------- + ++// We can use most of the VST3 SDK's Windows UTF-16 functionality by just ++// creating aliases for equivalent Linux functions ++#if __WINE__ ++#define wcsicmp wcscasecmp ++#define wcsnicmp wcsncasecmp ++#define _vsnwprintf vswprintf ++#define stricmp strcasecmp ++#define strnicmp strncasecmp ++#endif ++ + // 16 bit string operations + #if SMTG_CPP11 // if c++11 unicode string literals + #define SMTG_CPP11_CAT_PRIVATE_DONT_USE(a,b) a ## b +diff --git a/pluginterfaces/base/ftypes.h b/pluginterfaces/base/ftypes.h +index 133dbba..33ecae3 100644 +--- a/pluginterfaces/base/ftypes.h ++++ b/pluginterfaces/base/ftypes.h +@@ -154,7 +154,7 @@ namespace Steinberg + // always inline macros (only when RELEASE is 1) + //---------------------------------------------------------------------------- + #if RELEASE +- #if SMTG_OS_MACOS || SMTG_OS_LINUX || defined(__MINGW32__) ++ #if SMTG_OS_MACOS || SMTG_OS_LINUX || defined(__WINE__) + #define SMTG_ALWAYS_INLINE __inline__ __attribute__((__always_inline__)) + #define SMTG_NEVER_INLINE __attribute__((noinline)) + #elif SMTG_OS_WINDOWS +diff --git a/pluginterfaces/base/ustring.cpp b/pluginterfaces/base/ustring.cpp +index 24a412f..8e631c9 100644 +--- a/pluginterfaces/base/ustring.cpp ++++ b/pluginterfaces/base/ustring.cpp +@@ -38,6 +38,10 @@ + + #endif + ++#ifdef __WINE__ ++#include ++#endif ++ + //------------------------------------------------------------------------ + namespace Steinberg { + +@@ -173,7 +177,7 @@ bool UString::scanFloat (double& value) const + bool UString::printFloat (double value, int32 precision) + { + #if SMTG_OS_WINDOWS +- return swprintf ((wchar_t*)thisBuffer, L"%.*lf", precision, value) != -1; ++ return swprintf ((wchar_t*)thisBuffer, thisSize, L"%.*lf", precision, value) != -1; + #elif SMTG_OS_MACOS + bool result = false; + CFStringRef cfStr = CFStringCreateWithFormat (0, 0, CFSTR("%.*lf"), precision, value); +@@ -238,7 +242,7 @@ bool UString::scanInt (int64& value) const + bool UString::printInt (int64 value) + { + #if SMTG_OS_WINDOWS +- return swprintf ((wchar_t*)thisBuffer, L"%I64d", value) != -1; ++ return swprintf ((wchar_t*)thisBuffer, thisSize, L"%I64d", value) != -1; + + #elif SMTG_OS_MACOS + CFStringRef cfStr = CFStringCreateWithFormat (0, 0, CFSTR("%lld"), value); +Submodule public.sdk contains modified content +diff --git a/public.sdk/source/common/systemclipboard_win32.cpp b/public.sdk/source/common/systemclipboard_win32.cpp +index c5cb2b8..2ee3d65 100644 +--- a/public.sdk/source/common/systemclipboard_win32.cpp ++++ b/public.sdk/source/common/systemclipboard_win32.cpp +@@ -111,7 +111,7 @@ bool copyTextToClipboard (const std::string& text) + { + if (auto* data = static_cast (GlobalLock (memory))) + { +-#if defined(__MINGW32__) ++#if defined(__WINE__) + memcpy (data, wideStr.data (), byteSize); + #else + memcpy_s (data, byteSize, wideStr.data (), byteSize); +diff --git a/public.sdk/source/vst/hosting/module_win32.cpp b/public.sdk/source/vst/hosting/module_win32.cpp +index 2ba9319..ab6d72a 100644 +--- a/public.sdk/source/vst/hosting/module_win32.cpp ++++ b/public.sdk/source/vst/hosting/module_win32.cpp +@@ -44,35 +44,10 @@ + #include + #include + +-#if SMTG_CPP17 +- +-#if __has_include() +-#define USE_FILESYSTEM 1 +-#elif __has_include() +-#define USE_FILESYSTEM 0 +-#endif +- +-#else // !SMTG_CPP17 +- +-#define USE_FILESYSTEM 0 +- +-#endif // SMTG_CPP17 +- +-#if USE_FILESYSTEM == 1 +- +-#include +-namespace filesystem = std::filesystem; +- +-#else // USE_FILESYSTEM == 0 +- +-// The header is deprecated. It is superseded by the C++17 +-// header. You can define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING to silence the +-// warning, otherwise the build will fail in VS2019 16.3.0 +-#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING +-#include +-namespace filesystem = std::experimental::filesystem; +- +-#endif // USE_FILESYSTEM ++// `std::filesystem` doesn't work correctly with wineg++, resulting in weird ++// memory errors. This library is a drop-in replacement. ++#include ++namespace filesystem = ghc::filesystem; + + #pragma comment(lib, "Shell32") + +@@ -320,7 +295,7 @@ VST3::Optional resolveShellLink (const filesystem::path& p) + #elif USE_OLE + Ole::instance (); + +- IShellLink* shellLink = nullptr; ++ IShellLinkW* shellLink = nullptr; + if (!SUCCEEDED (CoCreateInstance (CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, + IID_IShellLink, reinterpret_cast (&shellLink)))) + return {}; +@@ -405,13 +380,13 @@ void findFilesWithExt (const filesystem::path& path, const std::string& ext, + filesystem::path result; + if (checkVST3Package (p, &result)) + { +- pathList.push_back (result.generic_u8string ()); ++ pathList.push_back (result.generic_string ()); + continue; + } + findFilesWithExt (cp, ext, pathList, recursive); + } + else +- pathList.push_back (cp.generic_u8string ()); ++ pathList.push_back (cp.generic_string ()); + } + else if (recursive) + { +@@ -431,18 +406,18 @@ void findFilesWithExt (const filesystem::path& path, const std::string& ext, + filesystem::path result; + if (checkVST3Package (*resolvedLink, &result)) + { +- pathList.push_back (result.generic_u8string ()); ++ pathList.push_back (result.generic_string ()); + continue; + } + findFilesWithExt (*resolvedLink, ext, pathList, recursive); + } + else +- pathList.push_back (resolvedLink->generic_u8string ()); ++ pathList.push_back (resolvedLink->generic_string ()); + } + else if (filesystem::is_directory (*resolvedLink)) + { +- const auto& str = resolvedLink->generic_u8string (); +- if (cp.generic_u8string ().compare (0, str.size (), str.data (), ++ const auto& str = resolvedLink->generic_string (); ++ if (cp.generic_string ().compare (0, str.size (), str.data (), + str.size ()) != 0) + findFilesWithExt (*resolvedLink, ext, pathList, recursive); + } diff --git a/gnu/packages/patches/yabridge-5.0.4-dependencies.patch b/gnu/packages/patches/yabridge-5.0.4-dependencies.patch new file mode 100644 index 0000000000..77db050e91 --- /dev/null +++ b/gnu/packages/patches/yabridge-5.0.4-dependencies.patch @@ -0,0 +1,36 @@ +Meson fails to detect bitsery, function2 and gulrak-filesystem. +https://github.com/robbert-vdh/yabridge/issues/18 + +This patch removes these dependencies in "meson.build". + + +diff --git a/meson.build b/meson.build +index d8d9135b..b35ebfcd 100644 +--- a/meson.build ++++ b/meson.build +@@ -248,22 +248,13 @@ else + asio_dep = dependency('asio', version : '>=1.22.0') + endif + +-if meson.version().version_compare('>=0.60') +- # Bitsery's CMake build definition is capitalized for some reason +- bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0') +-else +- # Mmeson <=0.6.0 didn't support multiple names for a dependency, and since at +- # the moment this is only relevant for packing on Arch btw, it's probably +- # better to remove this conditional later than it is to bump the minimum Meson +- # version now. +- bitsery_dep = dependency('bitsery', version : '>=5.2.0') +-endif ++bitsery_dep = declare_dependency() + + # The D-Bus headers are also only accessed through the include path. We don't + # link to libdbus-1 to make soname changes don't completely break yabridge. + dbus_dep = dependency('dbus-1').partial_dependency(compile_args : true, includes : true) +-function2_dep = dependency('function2', version : '>=4.0.0') +-ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0') ++function2_dep = declare_dependency() ++ghc_filesystem_dep = declare_dependency() + threads_dep = dependency('threads') + # Tomlplusplus recently added a shraed library version. We don't want to link to that. + tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true)