From patchwork Thu Apr 30 22:39:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 21779 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 CDE3727BBE4; Thu, 30 Apr 2020 23:41:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 4828A27BBE1 for ; Thu, 30 Apr 2020 23:41:22 +0100 (BST) Received: from localhost ([::1]:50362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUHrt-0004qv-9O for patchwork@mira.cbaines.net; Thu, 30 Apr 2020 18:41:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39872) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUHqs-0004jx-Jh for guix-patches@gnu.org; Thu, 30 Apr 2020 18:40:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUHqd-00083W-2R for guix-patches@gnu.org; Thu, 30 Apr 2020 18:40:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36323) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUHqc-000814-Ae for guix-patches@gnu.org; Thu, 30 Apr 2020 18:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUHqc-000791-4C for guix-patches@gnu.org; Thu, 30 Apr 2020 18:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40989] [PATCH] gnu: supercollider: Enable SCClassLibrary library lookup. Resent-From: goodoldpaul@autistici.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 22:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40989@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158828637727424 (code B ref -1); Thu, 30 Apr 2020 22:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2020 22:39:37 +0000 Received: from localhost ([127.0.0.1]:47869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUHq9-00078D-Is for submit@debbugs.gnu.org; Thu, 30 Apr 2020 18:39:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:55630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUHq8-000785-91 for submit@debbugs.gnu.org; Thu, 30 Apr 2020 18:39:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35294) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUHpw-0004Ez-TG for guix-patches@gnu.org; Thu, 30 Apr 2020 18:39:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUHpq-0005fO-B2 for guix-patches@gnu.org; Thu, 30 Apr 2020 18:39:19 -0400 Received: from confino.investici.org ([212.103.72.250]:42867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUHpo-0005MO-CX for guix-patches@gnu.org; Thu, 30 Apr 2020 18:39:12 -0400 Received: from 1.mail-backend.investici.org (unknown [10.0.0.11]) by confino.investici.org (Postfix) with ESMTP id 44FFA217B5 for ; Thu, 30 Apr 2020 22:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1588286347; bh=C8YIXxINAsZ13OxjbCsKgVukmnEyJ1Yu3tW6JVLcc78=; h=Date:From:To:Subject:From; b=KUzCvGh6TC8u/6XUZCyNJWrstvn5zB203ipLPLLcM34BrvQTs9dpgxS68uMPumGmJ ScQNz2GplRX0q8W6PePdmnSvag+dSJdEVnItIw6RbsXmFV5zJArc2dCMxi22vHM/wO Lp8H9/Ma5QYpy+1+8gqoOpIZz4H+tEBKzewDPVuQ= Received: from 1.webmail.investici.org (localhost [127.0.0.1]) (Authenticated sender: goodoldpaul@autistici.org) by 1.mail-backend.investici.org (Postfix) with ESMTPA id 1B1ADBEE39 for ; Thu, 30 Apr 2020 22:39:07 +0000 (UTC) MIME-Version: 1.0 Date: Thu, 30 Apr 2020 22:39:06 +0000 From: goodoldpaul@autistici.org User-Agent: Roundcube Webmail Message-ID: <5985840382a5ec1211b1882c9f07f16f@autistici.org> X-Sender: goodoldpaul@autistici.org Received-SPF: pass client-ip=212.103.72.250; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 18:39:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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 Hi, This patch fixes the error that prevents SuperCollider from starting. On Guix 229f4fa9522fb56b014ee9c0d8111e8fb6da764d and after having followed instructions from [0], the behavior is the following: orang3@frastanato ~/code/guix$ guix environment --ad-hoc jack supercollider qjackctl substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% The following derivation will be built: /gnu/store/zzrq8li1plk9ll7yx48lhf27ffk5fvy0-profile.drv The following profile hooks will be built: /gnu/store/jr02fwv31b0a07fcfkalgjjv1bq7ayx8-manual-database.drv /gnu/store/m4zril057cr1m55g7d56q9wp2mrbhhxg-fonts-dir.drv /gnu/store/mrfrb81vzcjxnj321fzi8nqkpvx6s5zw-info-dir.drv /gnu/store/spp41dzc0bmpbr9wvif8r4r2fs02zgfv-ca-certificate-bundle.drv building CA certificate bundle... building fonts directory... building directory of Info manuals... building database for manual pages... building profile with 3 packages... orang3@frastanato ~/code/guix [env]$ sclang SC FFT global init: cosTable initialised. compiling class library... Found 718 primitives. Compiling directory '/gnu/store/rrmvq9gzlvijliwlm35xml65jjqq8s29-supercollider-3.10.4/share/SuperCollider/Extensions' Compiling directory '/home/orang3/.local/share/SuperCollider/Extensions' ERROR: There is a discrepancy. numClassDeps 0 gNumClasses 82 sc3> s.boot Library has not been compiled successfully. The implemented solution is to hardcode SCClassLibrary's path into SuperCollider. [0]: https://guix.gnu.org/manual/en/html_node/Base-Services.html#index-realtime From f825d1872628eea6f29ee7a92b8bbc339935dbcf Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Fri, 1 May 2020 00:24:52 +0200 Subject: [PATCH] gnu: supercollider: Enable SCClassLibrary library lookup. This hardcodes the path of SCClassLibrary to fix a lookup error that was preventing SCServer's boot. * gnu/packages/audio.scm (supercollider): [source]: Fetch via git. [configure-flags]: Build Release target. [phases]: ...hardcode path using substitute* in a new phase. --- gnu/packages/audio.scm | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e2e276723b..badcf3d5f6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -2294,18 +2295,19 @@ background file post-processing.") (name "supercollider") (version "3.10.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/supercollider/supercollider" - "/releases/download/Version-" version - "/SuperCollider-" version "-Source-linux.tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/supercollider/supercollider.git") + (commit (string-append "Version-" version)) + (recursive? #t))) ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack + (file-name (git-file-name name version)) (sha256 (base32 - "0x11g3pfw11m6v18qfpfl5w99dbmf73g4z7wvwhrj1a4qv2dn084")))) + "0xdg1dx0y0agircnkn4bg3jpw184xc5pn28k7rrzgjh1rdnyzz24")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on" - "-DSC_QT=off" + "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release" "-DSC_EL=off") ;scel is packaged individually as ;emacs-scel #:modules ((guix build utils) @@ -2343,7 +2345,17 @@ background file post-processing.") (("add_subdirectory\\(sclang\\)") "")) (delete-file "testsuite/sclang/CMakeLists.txt") - #t))))) + #t)) + (add-after 'disable-broken-tests '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 "\")"))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- 2.26.2