From patchwork Wed Nov 1 09:09:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55772 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 F0B0527BBE2; Wed, 1 Nov 2023 09:12:25 +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 919C727BBEB for ; Wed, 1 Nov 2023 09:12:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7F8-0000Tb-Ed; Wed, 01 Nov 2023 05:10:30 -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 1qy7F6-0000SH-JM for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:28 -0400 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 1qy7F6-0000K4-B1 for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Fe-0004KD-HY for guix-patches@gnu.org; Wed, 01 Nov 2023 05:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 1/6] gnu: asio: Update to 1.28.0. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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 Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882983716515 (code B ref 66870); Wed, 01 Nov 2023 09:11:02 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:10:37 +0000 Received: from localhost ([127.0.0.1]:49835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FE-0004IJ-R1 for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:37 -0400 Received: from layka.disroot.org ([178.21.23.139]:50172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FB-0004I2-WA for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:35 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9A0CE44F69; Wed, 1 Nov 2023 10:09:58 +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 UffoNfd2-Kfh; Wed, 1 Nov 2023 10:09:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829797; bh=YFjR1I56wXlhEq6lJRWl3flkb2Ap25KnvxNqn5yFY2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IVVQynnWSagSuxJLTKmr7hhhaWbQ81XC9nQIAJG+Xw/PkrAtjh8Tdq72g/+LNyQlG 17NnJ1c6S+0YjfZGJra89BkxlKSJNpw+n210zs+M0wddvcH6OdHkPqzysAhD3lhOHe A3GV1Qoj1pjLGoeiThs2UgCrin6s0O3B0ZgqhZ4YX+x6StX01pD+AHG6wte+SZqWw9 QoVxMeUMOcCQST5ni1UvKKiFW6i+yAXwn7MTYiBZL1xX5c1GCia7vPtqtaETGX1Jpb 59r3p0H1TrkZEva9a03Km32OSPqG/oj9TxyOcW0F4oZuER0KffWG5pf79abivZizt/ jORUVngZCmHbw== Date: Wed, 1 Nov 2023 10:09:37 +0100 Message-ID: In-Reply-To: References: 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. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 86309e4ab3..1d50025d83 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3412,14 +3412,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)) From patchwork Wed Nov 1 09:09:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55771 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 D1D7C27BBEC; Wed, 1 Nov 2023 09:12:24 +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 09A9327BBE2 for ; Wed, 1 Nov 2023 09:12:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7F8-0000Tg-Kg; Wed, 01 Nov 2023 05:10:30 -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 1qy7F6-0000SR-V5 for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:28 -0400 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 1qy7F6-0000K9-MY for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Fe-0004KK-TO for guix-patches@gnu.org; Wed, 01 Nov 2023 05:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 2/6] gnu: Add bitsery. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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 Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882983916530 (code B ref 66870); Wed, 01 Nov 2023 09:11:02 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:10:39 +0000 Received: from localhost ([127.0.0.1]:49838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FH-0004IY-4B for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:39 -0400 Received: from layka.disroot.org ([178.21.23.139]:50184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FF-0004II-1x for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:37 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 382C844DB2; Wed, 1 Nov 2023 10:10:02 +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 inat0Frxi9WC; Wed, 1 Nov 2023 10:10:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829801; bh=9/Qx4ZY9EfuHKuGHESFd0MDXTmhWxPkeAX0otIbobfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iY3dDav0o2ckuY4SFFgABkat9EUp/045q6jfk5LvLfGxz86I7vZZ1lVb5xyh97Ouj dTTdECFEdvAGqJq8PORbWoywZvEBP2Df1Y1TMiFxOthQBxfRp3K4/cg74Y4vaii8Uk Ag8zeUbtDQXWaEH5Dt5VhOjvEtE0Fpc910eR7GTMwdE6jD5WcvQpNQMPDqnTsW4TE0 LaOFbxxpMS4ekD7vysVTs23bJPXwn/pUpED7u18/WfxfCHjkXBWssOxhPzsKCYl1Yq YmtEpWRSZH7T5Z339/CQNEYz7P4kgMnJOQjXZbDD4E2FVL/eQ7Q5VtGLEkvqrdNKw0 SwMSL5nOeqGRw== Date: Wed, 1 Nov 2023 10:09:38 +0100 Message-ID: <569e9401ff75a25937a96c1acbe8dbb0f04d4ca3.1698829285.git.sughosha@disroot.org> In-Reply-To: References: 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 0ce60c49de..7d91c72489 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2278,6 +2278,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 Wed Nov 1 09:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55774 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 91AF127BBEA; Wed, 1 Nov 2023 09:13:24 +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 ACB2A27BBE2 for ; Wed, 1 Nov 2023 09:13:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7F9-0000Ud-Cq; Wed, 01 Nov 2023 05:10:31 -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 1qy7F7-0000Sc-ER for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:29 -0400 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 1qy7F7-0000KJ-69 for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Ff-0004KS-CO for guix-patches@gnu.org; Wed, 01 Nov 2023 05:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 3/6] gnu: Add function2. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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 Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882984516553 (code B ref 66870); Wed, 01 Nov 2023 09:11:03 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:10:45 +0000 Received: from localhost ([127.0.0.1]:49841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FN-0004Ir-Fi for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:45 -0400 Received: from layka.disroot.org ([178.21.23.139]:48486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FK-0004Ij-8r for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:43 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4CED644F36; Wed, 1 Nov 2023 10:10:07 +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 HeH3lPEpav9f; Wed, 1 Nov 2023 10:10:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829806; bh=RnaNQyNHhTHG2H+Q4uC3RF8dnJXzrkdVuEiMsb5lLCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IY+VkC4SqtUWYGNx54iU/Poy2wn5x4eJEA9vtuq7NgLuBI2O1N/uMabPmafVc51Mu dY2hj598UdB8r0w0bt/TdLsPvwYltZ+DxAS7A6BMuv6aWd7oJ2wKYnEvS7yndX9Deb 3Tt3JTqceC3CkqPbDSw6LNpV4r1H0JXznZ2YzsTREGtfPiEX/PvpSjWW5j1k7I9av0 zJy277Gq/aBTkJ0oQPtuL60AXMO+HAeVBVTZWxZg7XVe0RF8bg95Ojjq6gaNr35Ulv IMQwpVg1YmrYIi9nfTkF7NZEqrNwGWyXrd+KYXBWeEM+PaALPqc1GKzDLdxLOEzCm+ O87i2z/bhwZ8Q== Date: Wed, 1 Nov 2023 10:09:39 +0100 Message-ID: In-Reply-To: References: 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d91c72489..6c99f39639 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2302,6 +2302,39 @@ (define-public bitsery (home-page "https://github.com/fraillt/bitsery") (license license:expat))) +(define-public function2 + (package + (name "function2") + (version "4.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Naios/function2") + (commit version) + ;; Tests require to compile googletest with custom + ;; features. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zdi6jk3srjkx82kbmd9rfmj9c1rr2xlsz2hbdcjvcjp63vzzxd1")))) + (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 Wed Nov 1 09:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55768 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 89C1B27BBEC; Wed, 1 Nov 2023 09:11:43 +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 27D9B27BBE2 for ; Wed, 1 Nov 2023 09:11:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7FA-0000Uq-4t; Wed, 01 Nov 2023 05:10:32 -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 1qy7F8-0000Ti-Mm for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:30 -0400 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 1qy7F8-0000Kf-FD for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Fg-0004Kr-L3 for guix-patches@gnu.org; Wed, 01 Nov 2023 05:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 4/6] gnu: Add tomlplusplus. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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: Sughosha Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882986016609 (code B ref 66870); Wed, 01 Nov 2023 09:11:04 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:11:00 +0000 Received: from localhost ([127.0.0.1]:49850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7Fb-0004Jm-E1 for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:59 -0400 Received: from layka.disroot.org ([178.21.23.139]:48496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FO-0004J3-Ry for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:57 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0A10144E55; Wed, 1 Nov 2023 10:10:12 +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 1IQHrSBAgJL2; Wed, 1 Nov 2023 10:10:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829811; bh=8S3PVBNy7HBpTpt1uQAM6X+fU5VVL2ieHZfPizCcHNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=igmRZX5JkKjuYrBtcHkZqosdtQOjLu3M9+pidzS1XvcKLrpyDPftJ+Wotyw2CW1lA +LPwKk1MzIAmSwOzJ2bhUaCz2FJrHtKqzvNzj/p3JmUyfkRZZlXSBd+YwvjxYhStaN sDkYYQ1MdzZXgiTfSTFrGtyLuh+nlwAs+aWD90PsyBqTWrSCXptqEHq6/YE1LyxTVq ugz8ggYph7AR31Cyrg/55qwcbUNe4RWelrubuKIjDBRxUIn/GF3QHsMJRLjTkyJfdN rSyzDt97+mHkO+/V6PRSjqDWnRQ/w5DbBylfEWp7oOAgRDKBJieWimh7UxzQbWkt5F hVes4vwwnyDNQ== Date: Wed, 1 Nov 2023 10:09:40 +0100 Message-ID: <70d0b1f869f5e305c8f74c307b74a42ff47e5359.1698829285.git.sughosha@disroot.org> In-Reply-To: References: 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 6c99f39639..450c4b3dc1 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) @@ -2335,6 +2336,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 Wed Nov 1 09:09:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55769 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 56A5E27BBE2; Wed, 1 Nov 2023 09:11:48 +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 2ED7C27BBEA for ; Wed, 1 Nov 2023 09:11:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7FA-0000Ur-5I; Wed, 01 Nov 2023 05:10:32 -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 1qy7F7-0000Su-Ss for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:29 -0400 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 1qy7F7-0000KQ-LW for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Ff-0004Ka-O4; Wed, 01 Nov 2023 05:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 5/6] gnu: Add clap. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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 X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882985316577 (code B ref 66870); Wed, 01 Nov 2023 09:11:03 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:10:53 +0000 Received: from localhost ([127.0.0.1]:49845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FU-0004JI-Rt for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:53 -0400 Received: from layka.disroot.org ([178.21.23.139]:55652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FS-0004J8-69 for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:51 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6A14744E23; Wed, 1 Nov 2023 10:10:15 +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 iBqRIx3Z-zS8; Wed, 1 Nov 2023 10:10:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829814; bh=JqjZY672C9EEnQiTzeac/6mG5j3T1gKlhWIu0kHOFVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dZ/EUR6Ags5y2jqVzBmeuv57LI85ZQfPvGxoawiL59hYzjc5yIRDFUlVEl95h5Oss sVkk3Q5Eq8Vwm6OwM+M0Yo5Z03GRjnwsoibNS41yppZama8N419c5Q3iivq1bn/vC7 AHTTD1Qxq9IfS+f4BEvm/8OWyRPZbDTnXvt7IMfr/7mVcQZIZdLHBYTXrjhZAhqzco p7LLNpiAu46UDJGTWTJJDu85Biin9cSuHtcipE7XBIHHslmcz8StFciqHDxaRrime7 SyKtXO69cvwWBmtTrSnIWoedwi/bL81InWoNEn6GW7fAWRnYuoKZ7p56FJ/N027SjL 88vWEpyFjvgnw== Date: Wed, 1 Nov 2023 10:09:41 +0100 Message-ID: <1998f3b99d5d118b047b8ece6333ddb11988b7cc.1698829285.git.sughosha@disroot.org> In-Reply-To: References: 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 7c49ba1841..3a99131d1b 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.9") + (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 + "0z1van2wj68qv5rcvf19rc4xg57ywycdzmc0wrzss334cd9z8qyg")))) + (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 Wed Nov 1 09:09:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55773 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 5963F27BBEA; Wed, 1 Nov 2023 09:13:12 +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 4086F27BBE2 for ; Wed, 1 Nov 2023 09:13:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy7F9-0000Uo-Tk; Wed, 01 Nov 2023 05:10:31 -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 1qy7F8-0000TQ-8O for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:30 -0400 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 1qy7F8-0000KX-00 for guix-patches@gnu.org; Wed, 01 Nov 2023 05:10:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy7Fg-0004Ki-63; Wed, 01 Nov 2023 05:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66870] [PATCH 6/6] gnu: Add yabridge. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 09:11: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: Sughosha , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 66870-submit@debbugs.gnu.org id=B66870.169882985816600 (code B ref 66870); Wed, 01 Nov 2023 09:11:04 +0000 Received: (at 66870) by debbugs.gnu.org; 1 Nov 2023 09:10:58 +0000 Received: from localhost ([127.0.0.1]:49848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FZ-0004Ja-6P for submit@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:58 -0400 Received: from layka.disroot.org ([178.21.23.139]:55658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy7FW-0004JR-RH for 66870@debbugs.gnu.org; Wed, 01 Nov 2023 05:10:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 12EED44F87; Wed, 1 Nov 2023 10:10:20 +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 qM8luFKkecK1; Wed, 1 Nov 2023 10:10:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698829818; bh=H4hr1bQ5S9gPzFNMnGgFuAt5nGSMh8dLst4pwkZHq7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L8E1vGKC5RCNh5wYg/U0kA+xeXL8asPDayk+V1rSNBSjqMc/hvOtEVldM1azNWSTb xMl6gzG66YEBb8XnunbmwChijYK07PZk3yP7pZUHnYZ5Fqgdt8Oxl17+FuiNLg0iP/ WJXKGJKqGSd8kocOd63/E7+CSMAemXlG5xiRJukKrGjOs9WuRLwgsnPL1IPp0iECEh /ub10TmCYOgHHHfMT8/BG6YHs9CHMiRlQiYk270U4ws3Hz4pL4QxMI3IvrNFvgLyem jXphWlgjXSDV9KFBPutV+mivISFmo2bvYWVQTTF70i/ilnfcprbcwPOa06XTxar+7t 3AOpIXg+D0xoQ== Date: Wed, 1 Nov 2023 10:09:42 +0100 Message-ID: <16a0c66df80da5013e2d12979b6829e6273338cb.1698829285.git.sughosha@disroot.org> In-Reply-To: References: 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-fix-dependency-search.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: I10331fbc9827bf1665a03afafe44a6c45c2c4c76 --- gnu/local.mk | 2 + gnu/packages/audio.scm | 129 ++++++++++++ ...3sdk-3.7.7-allow-winelib-compilation.patch | 191 ++++++++++++++++++ .../patches/yabridge-5.0.4-dependencies.patch | 36 ++++ 4 files changed, 358 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 27e57302ae..d0867724e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2114,6 +2114,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 \ @@ -2165,6 +2166,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-fix-dependency-search.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 3a99131d1b..aae97d4169 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) @@ -5927,6 +5930,132 @@ (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")) + (modules '((guix build utils))))) + (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\","))) + (let ((wine + #$(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") "wine64") + (_ "wine32"))) + (arch + #$(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") + "x86_64-unix") + (_ "i386-unix")))) + (substitute* "meson.build" + (("-lole32") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libole32.a"))) + (("-lshell32") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libshell32.a"))) + (("-luuid") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libuuid.a"))))))) + (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 default clap version with the next update of yabrigde. + ;; https://github.com/robbert-vdh/yabridge/commit/f67a170a882266d30e76977653272471498eab68 + `(("clap" + ,(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"))))))) + ("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 + (match (%current-system) + ((or "x86_64-linux" "aarch64") wine64) + (_ wine)))) + ;; Support the platforms that are supported by wine and 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 both 32-bit and 64-bit Windows VST2, VST3, and CLAP plugins in +64-bit Linux 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)