From patchwork Mon Jul 3 20:52:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 14525 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 20E1F27BBEB; Mon, 3 Jul 2023 21:53:25 +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,URIBL_BLOCKED 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 902C727BBE2 for ; Mon, 3 Jul 2023 21:53:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGQXh-0006ix-Bu; Mon, 03 Jul 2023 16:53:05 -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 1qGQXe-0006hN-SM for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53: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 1qGQXe-0006ca-JK for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGQXd-0005HD-UX for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64374] [PATCH v2 1/3] gnu: ardour: Update to 7.5. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 20:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64374@debbugs.gnu.org Cc: Sughosha Received: via spool by 64374-submit@debbugs.gnu.org id=B64374.168841756020237 (code B ref 64374); Mon, 03 Jul 2023 20:53:01 +0000 Received: (at 64374) by debbugs.gnu.org; 3 Jul 2023 20:52:40 +0000 Received: from localhost ([127.0.0.1]:34549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXI-0005GK-7I for submit@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXF-0005Fu-B0 for 64374@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:38 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C0EEC44DB7; Mon, 3 Jul 2023 22:52:32 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nuOfGeO1wuAH; Mon, 3 Jul 2023 22:52:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1688417551; bh=8+jjSwVTM822oev9HsuvPzqnmwNxr18b1HInTcy9N5M=; h=From:To:Cc:Subject:Date; b=YENRp1AR+Q/LM7DHLj4RH3kZXSEcHwU4l8dIAA9PPUPF1hFDNuhscvUfnr0DOGreG j6BbW7+ymExcsyASkMagSmUT+Vp1SGZWbLCNl24ZAUS49IIBOveHOwEpVYIYKloz8E vv4Qhr2W5z4h1BIX/glIVDGyc6AK33rg5vYhc7hdMLZ/dVxOWPXN1/FWcfnxBy3zOK Ot+lvzFf82G71bgFp+yeVD27bDUywy0SmOZRDfJc/MMy1KTrbm6UoQzlxvYdKkuxHQ p1aySW0bVG1/L1TAa/fXMP5x0cd08Eb1IlVE/Rk6htf8UIwVAWi44IgtKZXDfXr6sP KifLisYF0krpg== Date: Mon, 3 Jul 2023 22:52:17 +0200 Message-Id: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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 (ardour): Update to 7.5. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: a98126e604b666d08a4c9d838bf9c341acea7f17 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 88dbbbc7a2..550f653420 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -738,7 +738,7 @@ (define (ardour-rpath-phase major-version) (define-public ardour (package (name "ardour") - (version "7.4") + (version "7.5") (source (origin (method git-fetch) (uri (git-reference @@ -755,7 +755,7 @@ (define-public ardour namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }"))))) (sha256 (base32 - "0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89")) + "18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments From patchwork Mon Jul 3 20:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 14524 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 AA51F27BBEA; Mon, 3 Jul 2023 21:53:18 +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,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 D83BB27BBE2 for ; Mon, 3 Jul 2023 21:53:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGQXh-0006jX-Kx; Mon, 03 Jul 2023 16:53: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 1qGQXe-0006hO-Sh for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53: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 1qGQXe-0006cb-Ju for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGQXe-0005HK-Ax for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 20:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64374@debbugs.gnu.org Cc: Sughosha Received: via spool by 64374-submit@debbugs.gnu.org id=B64374.168841756120243 (code B ref 64374); Mon, 03 Jul 2023 20:53:02 +0000 Received: (at 64374) by debbugs.gnu.org; 3 Jul 2023 20:52:41 +0000 Received: from localhost ([127.0.0.1]:34551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXI-0005GM-Ii for submit@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXF-0005Fw-Ay for 64374@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:38 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A7E4144E7F; Mon, 3 Jul 2023 22:52:33 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y3e0f0wGr1So; Mon, 3 Jul 2023 22:52:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1688417552; bh=U3UwUWY4bNkqY010k6mnRoJoEMaNQ2RZNoFkqoE0hDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fUrixrwCbaY2bovEme+feBfE4dMW3Vu0SpQtuBw1CnDYMXxZulRNHEvbwnymEZ+6s 1tn9ZJSOdVGv1id/pvTqcB2+ACpcxiSX5vzG8A5kcfVsqdSm3FjECQYBKGI4JCSBSe zxIgxqZx9EGABhlFJLRPtMA5we3xg1MPPwn+1/MpN5HPHcDXYHd3MkZo0vR49JmRcm HSNVBJbqHGN2h8LMkRrRYbpbqgxPMHSVsoBIu6/FfvkFFugw1GvCi4hSIaiXpb9yhI DjgtrVlHNl8f2S38aRqVoEvOQhHpMxutBiaMivk+N1Rhhlst45qHexov5/kM2b+L0/ Z7kem0f12jOrA== Date: Mon, 3 Jul 2023 22:52:18 +0200 Message-Id: <525fecd2e07fd9e513af675ecae52cde0911cc62.1688416868.git.sughosha@disroot.org> In-Reply-To: References: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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 (ardour)[#:phases]: Add install-bundled-media. [native-inputs]: Add unzip. [license]: Add cc0 and expat. --- gnu/packages/audio.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 550f653420..25fa8acf33 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -735,6 +735,14 @@ (define (ardour-rpath-phase major-version) libdir "/surfaces" ":" libdir "/vamp" "\"]")))))) +(define ardour-bundled-media + (origin + (method url-fetch) + (uri "http://stuff.ardour.org/loops/ArdourBundledMedia.zip") + (sha256 + (base32 + "0k135sm559yywfidrya7h5cddwqa2p2abhimrar2khydf43f03d0")))) + (define-public ardour (package (name "ardour") @@ -793,7 +801,14 @@ (define-public ardour (add-after 'install 'install-man-page (lambda* (#:key outputs #:allow-other-keys) (install-file "ardour.1" (string-append (assoc-ref outputs "out") - "/share/man/man1"))))) + "/share/man/man1")))) + (add-after 'install 'install-bundled-media + (lambda* (#:key outputs #:allow-other-keys) + (invoke "unzip" "-d" (string-append (assoc-ref outputs "out") + "/share/ardour" + ,(version-major version) + "/media/") + ,ardour-bundled-media)))) #:test-target "test")) (inputs (list alsa-lib @@ -848,14 +863,17 @@ (define-public ardour gettext-minimal itstool perl - pkg-config)) + pkg-config + unzip)) (home-page "https://ardour.org") (synopsis "Digital audio workstation") (description "Ardour is a multi-channel digital audio workstation, allowing users to record, edit, mix and master audio and MIDI projects. It is targeted at audio engineers, musicians, soundtrack editors and composers.") - (license license:gpl2+))) + (license (list license:gpl2+ + license:cc0 ;used by MIDI Beats + license:expat)))) ;used by MIDI Chords and Progressions (define-public audacity (package From patchwork Mon Jul 3 20:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 14526 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 DE9C427BBE2; Mon, 3 Jul 2023 21:53:25 +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,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 00C4127BBE9 for ; Mon, 3 Jul 2023 21:53:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGQXi-0006jj-Tp; Mon, 03 Jul 2023 16:53: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 1qGQXf-0006hj-5d for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53: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 1qGQXe-0006cq-TQ for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGQXe-0005HT-Pd for guix-patches@gnu.org; Mon, 03 Jul 2023 16:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 20:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64374@debbugs.gnu.org Cc: Sughosha Received: via spool by 64374-submit@debbugs.gnu.org id=B64374.168841756320252 (code B ref 64374); Mon, 03 Jul 2023 20:53:02 +0000 Received: (at 64374) by debbugs.gnu.org; 3 Jul 2023 20:52:43 +0000 Received: from localhost ([127.0.0.1]:34553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXK-0005Ga-Uh for submit@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGQXF-0005Fx-Bf for 64374@debbugs.gnu.org; Mon, 03 Jul 2023 16:52:39 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E222240E67; Mon, 3 Jul 2023 22:52:33 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J0kQA6vpxcmA; Mon, 3 Jul 2023 22:52:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1688417552; bh=BJ5iTx0/CBKRtb541T1OLt84aV01dXKf5GDJrOreuIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e4ElIEQ3xHGMc9l5gc+1bXjVuUPYO4URcGBRS1waoIIEETr1aJ9dJCIn5UEqGvUlK gFXJ+JurMiC99CXTuUNqzn7BzkYW65zhcQmJSB8L9bTwhH7vy2BOQk3N0o5XhM+7Hz XElhfeJslIE5cAGv2PYlFOLA/tTZfJuzzxaii61OjxwftWZEV3IA16m9YFGWr0DBel xAEWPeUBG4hMLFB94UgjZ5Zb/oDR0zAIT7LHiak0OlFJNgl2CORkwKmkcAYsObkIaF E9ZgqZwW1r+hb0XIT/DOJH2Nmjiq5iKVZJEHt7ruMNCDGh3P9icNnmI8S0U91LnM8W /Dh/BWHWABVgQ== Date: Mon, 3 Jul 2023 22:52:19 +0200 Message-Id: <7d3a663f9e847009e20a2161227faa33daca91df.1688416868.git.sughosha@disroot.org> In-Reply-To: References: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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 (ardour)[#:phases]: Move ardour-rpath-phase inside this definition. (ardour-rpath-phase): Delete variable. --- gnu/packages/audio.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 25fa8acf33..b08827b133 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -720,21 +720,6 @@ (define-public qm-dsp purposes developed at Queen Mary, University of London.") (license license:gpl2+))) -(define (ardour-rpath-phase major-version) - `(lambda* (#:key outputs #:allow-other-keys) - (let ((libdir (string-append (assoc-ref outputs "out") - "/lib/ardour" ,major-version))) - (substitute* "wscript" - (("linker_flags = \\[\\]") - (string-append "linker_flags = [\"" - "-Wl,-rpath=" - libdir ":" - libdir "/backends" ":" - libdir "/engines" ":" - libdir "/panners" ":" - libdir "/surfaces" ":" - libdir "/vamp" "\"]")))))) - (define ardour-bundled-media (origin (method url-fetch) @@ -776,7 +761,20 @@ (define-public ardour #:phases (modify-phases %standard-phases (add-after 'unpack 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-major version))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((libdir (string-append (assoc-ref outputs "out") + "/lib/ardour" + ,(version-major version)))) + (substitute* "wscript" + (("linker_flags = \\[\\]") + (string-append "linker_flags = [\"" + "-Wl,-rpath=" + libdir ":" + libdir "/backends" ":" + libdir "/engines" ":" + libdir "/panners" ":" + libdir "/surfaces" ":" + libdir "/vamp" "\"]")))))) (add-after 'install 'install-freedesktop-files (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))