From patchwork Fri Apr 28 13:33:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 49651 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 DBD4327BBE9; Fri, 28 Apr 2023 14:36:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 C707E27BBE2 for ; Fri, 28 Apr 2023 14:36:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOGc-0007qb-3q; Fri, 28 Apr 2023 09:36:06 -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 1psOGa-0007pr-0N for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psOGZ-0004RV-1O for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psOGY-0000VD-84 for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63147] [PATCH 1/2] gnu: supercollider: Use G-expressions. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63147 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63147@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16826889031823 (code B ref -1); Fri, 28 Apr 2023 13:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:35:03 +0000 Received: from localhost ([127.0.0.1]:60789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOFa-0000TL-Ha for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:35:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:56050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOFX-0000Sh-Qr for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:35:01 -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 1psOFX-0007Ae-8h for guix-patches@gnu.org; Fri, 28 Apr 2023 09:34:59 -0400 Received: from m12.mail.163.com ([220.181.12.215]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOFM-0003pj-Ac for guix-patches@gnu.org; Fri, 28 Apr 2023 09:34:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=U/Df9 wKrT8sw0yP5v4163DSCENQIEjFQnFGna/ECqZ4=; b=aKi9/uHuvlOHtJK3E8Kst iCAcrp9iXtZJ9JgNR51QyoPyZijAXPHQh0YTDBErb8eot1SCnIkbEnGD+hBZ5gC9 o5MA9ahSBDAs7Aa8Y7/xUVww2mQOPDN9fHKpC+rBpcxIXUmWalCctH/+F+2nT8// vOJNWQWz3l3Q828Wc81pyk= Received: from localhost.localdomain (unknown [119.123.68.49]) by zwqz-smtp-mta-g5-2 (Coremail) with SMTP id _____wD3kghVy0tkdZWNAQ--.9886S2; Fri, 28 Apr 2023 21:34:30 +0800 (CST) From: Zhu Zihao Date: Fri, 28 Apr 2023 21:33:28 +0800 Message-Id: <20230428133329.31666-1-all_but_last@163.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CM-TRANSID: _____wD3kghVy0tkdZWNAQ--.9886S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr17AFyrXry8Kr45Aw48Crg_yoWrKF4fpr y7KwnayrZ8AryxJws3Zr4xZrW3KFZ2kw1Yyrs7Ar1Ik3yFkFWxJr47JrWfu3W7Jan7A3y7 Wa1vq34UXrW0grDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUzyxiUUUUU= X-Originating-IP: [119.123.68.49] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZghfr1aEDWR+4wAAs4 Received-SPF: pass client-ip=220.181.12.215; envelope-from=all_but_last@163.com; helo=m12.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (supercollider)[source]: Use G-expression in snippet. [arguments]: Use G-expressions. <#:phases>: Replace `(assoc-ref outputs ...)` with `#$output`. --- gnu/packages/audio.scm | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dca5e516a1..69570109d9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3460,64 +3460,64 @@ (define-public supercollider ;; The build system doesn't allow us to unbundle the following ;; libraries. hidapi is also heavily patched and upstream not ;; actively maintained. - '(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi" - "TLSF-2.4.6" "oscpack_1_1_0" "." ".."))) - (with-directory-excursion "./external_libraries" - (for-each - delete-file-recursively - (scandir "." - (lambda (x) - (and (eq? (stat:type (stat x)) 'directory) - (not (member (basename x) keep-dirs))))))) - ;; To find the Guix provided ableton-link library. - (substitute* "lang/CMakeLists.txt" - (("include\\(\\.\\./external_libraries/link/\ + #~(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi" + "TLSF-2.4.6" "oscpack_1_1_0" "." ".."))) + (with-directory-excursion "./external_libraries" + (for-each + delete-file-recursively + (scandir "." + (lambda (x) + (and (eq? (stat:type (stat x)) 'directory) + (not (member (basename x) keep-dirs))))))) + ;; To find the Guix provided ableton-link library. + (substitute* "lang/CMakeLists.txt" + (("include\\(\\.\\./external_libraries/link/\ AbletonLinkConfig\\.cmake\\)") - "find_package(AbletonLink NAMES AbletonLink ableton-link \ + "find_package(AbletonLink NAMES AbletonLink ableton-link \ link REQUIRED)")))))) (build-system cmake-build-system) (outputs '("out" ;core language "ide")) ;qt ide (arguments - `(#:configure-flags '("-DSYSTEM_BOOST=ON" - "-DSYSTEM_YAMLCPP=ON" - "-DSC_QT=ON" - "-DCMAKE_BUILD_TYPE=Release" - "-DFORTIFY=ON" - ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable? - "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel - #:phases - (modify-phases %standard-phases - ;; HOME must be defined otherwise supercollider throws a "ERROR: - ;; Primitive '_FileMkDir' failed." error when generating the doc. - ;; The graphical tests also hang without it. - (add-after 'unpack 'set-home-directory - (lambda _ - (setenv "HOME" (getcwd)))) - (add-after 'unpack 'patch-scclass-dir - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (scclass-dir - (string-append out - "/share/SuperCollider/SCClassLibrary"))) - (substitute* "lang/LangSource/SC_LanguageConfig.cpp" - (((string-append - "SC_Filesystem::instance\\(\\)\\.getDirectory" - "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME")) - (string-append "Path(\"" scclass-dir "\")")))))) - (add-before 'build 'prepare-x - (lambda _ - (system "Xvfb &") - (setenv "DISPLAY" ":0"))) - (add-before 'install 'install-ide - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (ide (assoc-ref outputs "ide")) - (scide "editors/sc-ide/scide")) - (install-file scide - (string-append ide "/bin")) - (delete-file scide))))))) + (list + #:configure-flags + #~(list "-DSYSTEM_BOOST=ON" + "-DSYSTEM_YAMLCPP=ON" + "-DSC_QT=ON" + "-DCMAKE_BUILD_TYPE=Release" + "-DFORTIFY=ON" + ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable? + "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel + #:phases + #~(modify-phases %standard-phases + ;; HOME must be defined otherwise supercollider throws a "ERROR: + ;; Primitive '_FileMkDir' failed." error when generating the doc. + ;; The graphical tests also hang without it. + (add-after 'unpack 'set-home-directory + (lambda _ + (setenv "HOME" (getcwd)))) + (add-after 'unpack 'patch-scclass-dir + (lambda _ + (let* ((scclass-dir + (string-append #$output + "/share/SuperCollider/SCClassLibrary"))) + (substitute* "lang/LangSource/SC_LanguageConfig.cpp" + (((string-append + "SC_Filesystem::instance\\(\\)\\.getDirectory" + "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME")) + (string-append "Path(\"" scclass-dir "\")")))))) + (add-before 'build 'prepare-x + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0"))) + (add-before 'install 'install-ide + (lambda _ + (let* ((ide #$output:ide) + (scide "editors/sc-ide/scide")) + (install-file scide + (string-append ide "/bin")) + (delete-file scide))))))) (native-inputs (list ableton-link pkg-config qttools-5 xorg-server-for-tests)) (inputs (list jack-1 From patchwork Fri Apr 28 13:33:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 49652 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 8530727BBE9; Fri, 28 Apr 2023 14:36:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 52C6C27BBE2 for ; Fri, 28 Apr 2023 14:36:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOGe-0007rQ-J9; Fri, 28 Apr 2023 09:36:08 -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 1psOGZ-0007pz-Qf for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psOGZ-0004Rd-DB for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psOGY-0000VS-W7 for guix-patches@gnu.org; Fri, 28 Apr 2023 09:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63148] [PATCH 2/2] gnu: supercollider: Update to 3.13.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 13:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63148@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16826889061845 (code B ref -1); Fri, 28 Apr 2023 13:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 13:35:06 +0000 Received: from localhost ([127.0.0.1]:60791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOFe-0000Th-2T for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:35:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:56058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOFX-0000Si-Pd for submit@debbugs.gnu.org; Fri, 28 Apr 2023 09:35:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOFX-0007Af-72 for guix-patches@gnu.org; Fri, 28 Apr 2023 09:34:59 -0400 Received: from m12.mail.163.com ([220.181.12.198]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOFL-0003pk-Gn for guix-patches@gnu.org; Fri, 28 Apr 2023 09:34:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=eBWXO Lng+OpCmgGjlUUfIzWfscfDEuB0g/gBncAKZec=; b=o05mv95ZUUu0Z8Npe4Gr1 hEE/T0nZkuNZEH1Hz7z08AOmpkBMdmImjFXnbyPsxXXXFffTk66RAvHwIxqpZ02k YuptxOcASlY5uWf8HS2Ru+8y8WCtpMui9yc/k/joi6NQvGdTqSb9GA/o6uvznGOX YibSZcdGjHvMS8wG3zogCc= Received: from localhost.localdomain (unknown [119.123.68.49]) by zwqz-smtp-mta-g5-2 (Coremail) with SMTP id _____wD3kghVy0tkdZWNAQ--.9886S3; Fri, 28 Apr 2023 21:34:32 +0800 (CST) From: Zhu Zihao Date: Fri, 28 Apr 2023 21:33:29 +0800 Message-Id: <20230428133329.31666-2-all_but_last@163.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230428133329.31666-1-all_but_last@163.com> References: <20230428133329.31666-1-all_but_last@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wD3kghVy0tkdZWNAQ--.9886S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZw43Zw4fXFy3Cw17KrykXwb_yoW3KFX_G3 4fAFykKrWkW3srKw4IkF1UKry5Jr47Aws2kF13KrWkKasxGw17XF1kKFn7AF1rKw4akFsa krs0kFWavr92gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7VUUuOJUUUUUU== X-Originating-IP: [119.123.68.49] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFApfr1aEBs25CwAAsF Received-SPF: pass client-ip=220.181.12.198; envelope-from=all_but_last@163.com; helo=m12.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (supercollider): Update to 3.13.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 69570109d9..c3db095007 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3441,7 +3441,7 @@ (define-public qjackrcd (define-public supercollider (package (name "supercollider") - (version "3.12.1") + (version "3.13.0") (source (origin (method git-fetch) @@ -3453,7 +3453,7 @@ (define-public supercollider (file-name (git-file-name name version)) (sha256 (base32 - "0id522338a464j1slcspajwc7klypbc9qpigw5mqjhrw970wij5z")) + "1dkpnaly4m2j41ypy7xj5m2yhbl4ykw3vbnam345z4dk6qhyj9b1")) (modules '((guix build utils) (ice-9 ftw))) (snippet