From patchwork Tue Jul 12 20:07:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40633 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 69DA627BBEA; Tue, 12 Jul 2022 21:09:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 2286527BBE9 for ; Tue, 12 Jul 2022 21:09:11 +0100 (BST) Received: from localhost ([::1]:52060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBMBy-0000Z6-Ap for patchwork@mira.cbaines.net; Tue, 12 Jul 2022 16:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBMBq-0000Yt-T9 for guix-patches@gnu.org; Tue, 12 Jul 2022 16:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBMBq-0000Yy-KI for guix-patches@gnu.org; Tue, 12 Jul 2022 16:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBMBq-0005R7-GA for guix-patches@gnu.org; Tue, 12 Jul 2022 16:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH v2] gnu: faust-2: Update to 2.41.1. References: In-Reply-To: Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Jul 2022 20:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.165765648320823 (code B ref 56452); Tue, 12 Jul 2022 20:09:02 +0000 Received: (at 56452) by debbugs.gnu.org; 12 Jul 2022 20:08:03 +0000 Received: from localhost ([127.0.0.1]:43689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBMAt-0005Pn-4D for submit@debbugs.gnu.org; Tue, 12 Jul 2022 16:08:03 -0400 Received: from mail-qv1-f46.google.com ([209.85.219.46]:35360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBMAr-0005P8-4t for 56452@debbugs.gnu.org; Tue, 12 Jul 2022 16:08:01 -0400 Received: by mail-qv1-f46.google.com with SMTP id l2so3367913qvt.2 for <56452@debbugs.gnu.org>; Tue, 12 Jul 2022 13:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eq8gRG6toUJZzM+x6VHHgta9dUQljwMc4Dm6jPYKJ0M=; b=hu/npWpk2iCzQ+QAOb8nfpwiHejoxmU9cM8+RghJITYJj66S0ady61IMGtQaKa3cnr 7Q0CapqSO77AdKi6kg+h5/Ms87MMD4RS8T7nkQSGNz0ehMlK86Bhc1B1AmmWgPYaE6Pl +NfOKRXqizfixuSyQIGfN9/n+lc2c7s2SFV5ZheBX4Wae0493DKx9hZNsfe3SxzmIBko aVXYmV8ZyxEEMJrTBGmCrPnMX62c1Waecs6My5Fhx1kjAdnaA1khi7u44V8UL1wr6Wc9 n89XZuyWu8JYeLPvCRVCBK+L8J7UxN0+4TCrVL/1xcPfanI++m8KIF+LMrDtMdfvOrzg 14ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eq8gRG6toUJZzM+x6VHHgta9dUQljwMc4Dm6jPYKJ0M=; b=kbO+Qs5jO471t8z8EmN3ZkNnKwXgkb+LGJr09MW+MP2lAUNlINKK7pFg2aXAdiRdbo FsaKcLl4TA2MR5wz6nJPWFZ+OJNsvHpwAYk/oX0DgBJw33iGYgK8gNoRiPjsDApCdA14 BYLYhDEQ0+gHV9OPgBDowZWtL+34WuLMXJF/K8uNZrXoTZYycY8AwSb/rqLMeS6iV4st I8RuyrzFpz6Yf0+sTVRA2Fi38HcNYNGuEK2N/58p1SmieEOSdfzoA1+HoYvbhEJyBTXa 3rij6Wmf9fZhyr+nJqCBwHF3CKEcFBtAhSn8ZrRlVGVfZNms12nVOl5sY4PE6Ub3Hv/V YqKQ== X-Gm-Message-State: AJIora8Nh913McCW1Iicxf0o2BDQkmcz4QQFdUj10JjXxRz7tWvJb1Az 1rijnu4FNoAscxOw34tYZBeWTLvcTKvMwIyl X-Google-Smtp-Source: AGRyM1sa4HeqOeXqVtzlijXaaeEofX+jZVVwu1cYQLab678HOFrllJhHkt7TMsha0bUH29dm10LBlA== X-Received: by 2002:a05:6214:1d29:b0:473:52fa:e550 with SMTP id f9-20020a0562141d2900b0047352fae550mr14668937qvd.38.1657656475420; Tue, 12 Jul 2022 13:07:55 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id cq12-20020a05622a424c00b0031eb5fa4b50sm4194382qtb.39.2022.07.12.13.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 13:07:54 -0700 (PDT) From: Greg Hogan Date: Tue, 12 Jul 2022 20:07:52 +0000 Message-Id: <1b69156c4538217f9c1233fd1247ef928b572806.1657656312.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (faust-2): Update to 2.41.1. [build-system]: Replace gnu-build-system with cmake-build-system. [arguments]<#:phases>: Invoke cmake directly to build the main package and invoke make directly to build ancillary tools. [native-inputs]: Replace llvm-3.8 with llvm. --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0922c74788..db4c3af248 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1952,7 +1952,7 @@ (define-public faust-0.9.67 (define-public faust-2 (package (inherit faust) - (version "2.5.23") + (version "2.41.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/grame-cncm/faust/" @@ -1960,15 +1960,29 @@ (define-public faust-2 "/faust-" version ".tar.gz")) (sha256 (base32 - "1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq")))) - (build-system gnu-build-system) + "0gk8ifxrbykq7ay0nvjns8fjryhp0wfhv5npgrl8xpgw9wfmw53j")))) + (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments faust) - ((#:make-flags flags) - `(list (string-append "prefix=" (assoc-ref %outputs "out")) - "world")))) + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + ;; The upstream package uses make to run cmake during the build stage. + ;; Here we ignore the Makefile and call cmake directly. + (replace 'configure + (lambda _ + (chdir "build") + (invoke "cmake" "-C" "backends/all.cmake" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))))) + ;; The sound2faust tool would be built in the Makefile's "world" target + (add-after 'install 'sound2faust + (lambda _ + (chdir "../tools/sound2faust") + (setenv "PREFIX" (assoc-ref %outputs "out")) + (invoke "make") + (invoke "make" "install")))))) (native-inputs - `(("llvm" ,llvm-3.8) + `(("llvm" ,llvm) ("which" ,which) ("xxd" ,xxd) ("ctags" ,emacs-minimal) ; for ctags