From patchwork Sun Dec 31 16:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 58263 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 D697E27BBEA; Sun, 31 Dec 2023 16:54:14 +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 38AE927BBE2 for ; Sun, 31 Dec 2023 16:54:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJz4d-0000AZ-TD; Sun, 31 Dec 2023 11:54:03 -0500 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 1rJz4a-00008y-Qc for guix-patches@gnu.org; Sun, 31 Dec 2023 11:54:01 -0500 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 1rJz4a-0004FS-Fc for guix-patches@gnu.org; Sun, 31 Dec 2023 11:54:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJz4b-0000Kk-ML for guix-patches@gnu.org; Sun, 31 Dec 2023 11:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 16:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68181@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17040416011223 (code B ref -1); Sun, 31 Dec 2023 16:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 16:53:21 +0000 Received: from localhost ([127.0.0.1]:46952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJz3x-0000Jf-9s for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:53:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJz3v-0000JR-Dm for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:53:19 -0500 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 1rJz3o-0008TH-Ib for guix-patches@gnu.org; Sun, 31 Dec 2023 11:53:12 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJz3m-0004Cm-NK for guix-patches@gnu.org; Sun, 31 Dec 2023 11:53:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1704041585; bh=1wKJwiUB0sH2LbGPQKhoIPIWo9dtvG5pJ66E5CWn2hg=; h=From:To:Cc:Subject:Date:From; b=BLSKl97s2GeaaS1QyAP/NOBCCs8TbAlBpDzxh5LgUPLEBVQTboBLJ1h4jnQaUI+sW VEdAcUyKKqdL7I3OwZ1TZ2JTNaCCPUWg/nUGiMb6LzkLeXfz3dsCdWUagBD9D6wiYG 1oRcaDoBBQRJ0HvNnNuAYa3B0/IFK6RmqMD+++sk= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4T34tT1jHHz10yG; Sun, 31 Dec 2023 16:53:05 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4T34tT0vlsz10wk; Sun, 31 Dec 2023 16:53:05 +0000 (UTC) Date: Sun, 31 Dec 2023 17:52:40 +0100 Message-ID: <20231231165240.18076-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul 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 Some extempore code (libs/contrib/rtmidi.xtm specifically) depend on rtmidi, this patch adds it to package inputs and hardcodes the soname path. * gnu/packages/music.scm (extempore)[inputs]: Add rtmidi-4.0; [arguments]: new phase. Change-Id: I16e055a68d48c813fb54dd55f686be102a0850af --- gnu/packages/music.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) base-commit: b7466215cd05c2a1cd7c7a18c92af30376d21043 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 77e952d383..a79fb3e4ee 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1073,6 +1073,16 @@ (define-public extempore ("gl/glcore-directbind" "libGL.so" "mesa") ("gl/glcompat-directbind" "libGL.so" "mesa"))) #t)) + (add-after 'hardcode-external-lib-paths 'hardcode-contrib-lib-paths + (lambda* (#:key inputs #:allow-other-keys) + (use-modules (ice-9 match)) + (for-each + (match-lambda + ((file-name lib pkg-name) + (substitute* (string-append "libs/contrib/" file-name ".xtm") + ((lib) (string-append (assoc-ref inputs pkg-name) + "/lib/" lib))))) + '(("rtmidi" "librtmidi.so" "rtmidi"))))) (add-after 'unpack 'use-own-llvm (lambda* (#:key inputs #:allow-other-keys) (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm")) @@ -1125,6 +1135,7 @@ (define-public extempore ("libffi" ,libffi) ("jack" ,jack-1) ("libsndfile" ,libsndfile) + ("rtmidi" ,rtmidi-4.0) ("glfw" ,glfw) ("apr" ,apr) ("stb-image"