From patchwork Tue Nov 23 13:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 34769 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 966F727BBE3; Tue, 23 Nov 2021 13:19:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E49D627BBE1 for ; Tue, 23 Nov 2021 13:19:30 +0000 (GMT) Received: from localhost ([::1]:60662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpVhq-0000Ad-2j for patchwork@mira.cbaines.net; Tue, 23 Nov 2021 08:19:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpVhP-00006W-EP for guix-patches@gnu.org; Tue, 23 Nov 2021 08:19:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpVhP-0007wX-5f for guix-patches@gnu.org; Tue, 23 Nov 2021 08:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpVhP-0000X1-0v for guix-patches@gnu.org; Tue, 23 Nov 2021 08:19:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52045] [PATCH] gnu: Add cl-clm. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Nov 2021 13:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52045 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: jgart Cc: 52045@debbugs.gnu.org, Pierre Neidhardt Received: via spool by 52045-submit@debbugs.gnu.org id=B52045.16376735372008 (code B ref 52045); Tue, 23 Nov 2021 13:19:02 +0000 Received: (at 52045) by debbugs.gnu.org; 23 Nov 2021 13:18:57 +0000 Received: from localhost ([127.0.0.1]:50264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpVhF-0000WC-Tp for submit@debbugs.gnu.org; Tue, 23 Nov 2021 08:18:57 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpVhC-0000Vb-MA for 52045@debbugs.gnu.org; Tue, 23 Nov 2021 08:18:52 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 553CB240029 for <52045@debbugs.gnu.org>; Tue, 23 Nov 2021 14:18:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1637673524; bh=4l7Wfj8vxKb7+i3cC3HjYO1IfTO8+9PGRHRdjTCMsFM=; h=From:To:Cc:Subject:Date:From; b=R/wUupeN9/2sDznldfrNUZF/gA1uEi7SkD4T1wA1hj68EMvD3ahh153GcRAm8oYz5 PXCFp+1WpkveW2tEuoJDbMX3IzxNMLRP3Uw6lW5ena9rbVyXVMUPezJ+a32Cq4pAWf UwK2mkTTL96AfH9tuMPg68OkNJVxvh/duw8nzdgKi04n/vJJghLafOqOcqBWZyIfOy wmjKDYDhpoU+eVJWpccr1qwta2VpXnn7JUS+i/ImwThzfSs907PMHXSWqMrppG+1Og fkNJqLo+u6+oSqEbSdZoRSIxPNbSG0KSIV76sA2gp9MVvzs82N8KvQKcRzM/4ZvQ6M DgTSv7UnvlKMg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Hz4TZ4nf5z9rxW; Tue, 23 Nov 2021 14:18:42 +0100 (CET) References: <20211122204527.27050-1-jgart@dismail.de> From: Guillaume Le Vaillant Date: Tue, 23 Nov 2021 13:00:45 +0000 In-reply-to: <20211122204527.27050-1-jgart@dismail.de> Message-ID: <87lf1fnh72.fsf@kitej> 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 jgart skribis: > Hi, > > This is another WIP patch for the Common Lisp Music package (CLM) for GNU Guix. > It has a similar package definition to CMN which was successfully packaged and merged > today into Guix thanks to the help of Bill, Guillaume, and Pierre: > > https://en.wikipedia.org/wiki/Common_Lisp_Music > > My goal in packaging clm and cmn is to subsequently be able to package > slippery-chicken for GNU Guix: > > https://github.com/mdedwards/slippery-chicken > > slippery-chicken hints at alsa headers required by clm on this line of its' install script: > > https://github.com/mdedwards/slippery-chicken/blob/master/sc-install#L29 > > But, I think that the most immediate issue might be with the asd file in the clm repo: > > https://ccrma.stanford.edu/software/clm/clm-5.tar.gz > > Here is the asd file printed for convenience (delimited by backticks): > > [...] > > Guillaume, do you see this asd file as needing a similar fix to your previous patching? > > If so, I can try my hands at patching it myself while using your previous > patch to Bill as a template I can follow. > > I would send a patch to Bill afterwards for review and inclusion in the tarball. > > My knowledge of asd file configuration is rather limited. Any advice here is much appreciated. > > all best, > > jgart Hi, Making an asdf system definition for clm similar to the one for cmn won't be enough, because in addition to compiling lisp files, the "all.lisp" file is also calling the "configure" script and calling gcc to compile C code and make a shared library. The attached modified version of your patch seems to compile clm without error (although some files end up in a different directory compared to "regular" lisp libraries), but I have not tested if it works as expected. From 8a9880fcc51f33e0ad2f8fa1887b71c55a78ffb9 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 22 Nov 2021 15:45:28 -0500 Subject: [PATCH] gnu: Add cl-clm. * gnu/packages/lisp-xyz.scm (cl-clm, sbcl-clm): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bb697c4c60..799d8f7bbc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -69,6 +69,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages file) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -19721,6 +19722,48 @@ (define-public cl-cmn (define-public ecl-cmn (sbcl-package->ecl-package sbcl-cmn)) +(define-public sbcl-clm + (package + (name "sbcl-clm") + (version "5") + (source + (origin + (method url-fetch) + (uri "https://ccrma.stanford.edu/software/clm/clm-5.tar.gz") + (sha256 + (base32 "1ckgl7rsnxppnf47jqayrbyhm3hv6c4f7n2994ylva6wiy5w7wp8")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("gcc" ,gcc))) + (inputs + `(("alsa-lib" ,alsa-lib))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "configure" + (("/bin/sh") + (which "bash"))) + (substitute* '("all.lisp" + "index.cl" + "initmus.lisp") + (("/bin/csh") + (which "bash"))) + (substitute* "all.lisp" + (("#\\+sbcl \\(shadowing-import 'clm:double\\)" all) + (string-append all + " #+sbcl (shadowing-import 'clm:env)")))))))) + (home-page "https://ccrma.stanford.edu/software/clm/") + (synopsis "Music synthesis and signal processing package") + (description +"Common Lisp Music is a music synthesis and signal processing package +in the Music V family.") + (license license:expat))) + +(define-public cl-clm + (sbcl-package->cl-source-package sbcl-clm)) + (define-public sbcl-cl-https-everywhere ;; No release. ;; Don't forget to update the https-everywhere input. -- 2.33.1