From patchwork Thu Oct 20 11:21:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43730 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 616A127BBEA; Thu, 20 Oct 2022 13:28:17 +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,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 E1E6E27BBE9 for ; Thu, 20 Oct 2022 13:28:15 +0100 (BST) Received: from localhost ([::1]:46784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUej-0003zG-OR for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 08:28:13 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olTgI-0003Uy-Nz for patchwork@mira.cbaines.net; Thu, 20 Oct 2022 07:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olTcg-0002kj-J4 for guix-patches@gnu.org; Thu, 20 Oct 2022 07:22:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olTcg-0005iU-As for guix-patches@gnu.org; Thu, 20 Oct 2022 07:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olTcf-0002ld-UJ for guix-patches@gnu.org; Thu, 20 Oct 2022 07:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58613] [PATCHES v2] gnu: ardour: Use system libraries and install man page References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Oct 2022 11:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58613 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "58613@debbugs.gnu.org" <58613@debbugs.gnu.org> Received: via spool by 58613-submit@debbugs.gnu.org id=B58613.166626489210598 (code B ref 58613); Thu, 20 Oct 2022 11:22:01 +0000 Received: (at 58613) by debbugs.gnu.org; 20 Oct 2022 11:21:32 +0000 Received: from localhost ([127.0.0.1]:33159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olTcB-0002ks-Ol for submit@debbugs.gnu.org; Thu, 20 Oct 2022 07:21:32 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:61999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olTc7-0002kb-G6 for 58613@debbugs.gnu.org; Thu, 20 Oct 2022 07:21:30 -0400 Date: Thu, 20 Oct 2022 11:21:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=yw5nibisijd7dj6pvplotjazpy.protonmail; t=1666264880; x=1666524080; bh=/hGayaEuTYcNSpNa2IliRvsjwSsY4o5W5gvZFNzhFTE=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=WfaS/h+9DjAar0+NntN4iROng8Gw6pA1ASS3Xjq618gmrOhRpouRf8iuonurRs4to XEfb+Kd7VgDUcfNrWdDVplfFf7vi7RE5R1ydpoAbiwx6YfExMUDfvOnQuAQwlt3HH+ p7aIbl9HLmrUbr6CQsWaGZVUVZqR4fy0iDyuBmLAtgUasXViO/c9fOFKLsflCf6A13 EKmTsG14rNXCOYM32crY7YIqqOGlCa/6aLfJ8NYPfAHSqBcyCxRc7YhM16tJ7QV4dY hPQ5ezsDTXq+hRsmHEXugVmzjpdPMncbVFW59VjCjP4yUH1Zdc4fQU7AyoX8PEkI5d I41FKgQyBnmFg== Message-ID: Feedback-ID: 45211691:user:proton 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" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha X-getmail-retrieved-from-mailbox: Patches Empty Message From 14dd0806ee58cc2b05f06bd28118419ff9623319 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 20 Oct 2022 13:10:53 +0200 Subject: [PATCH v2 2/2] gnu: ardour: Use system libraries and install man page * gnu/packages/audio.scm (ardour) [arguments]: Use external libraries and install man page. [inputs]: Add fluidsynth, hidapi, libltc and qm-dsp. --- gnu/packages/audio.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 516c5d57da..b3e8074f09 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -715,11 +715,12 @@ (define-public ardour (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments - `(#:configure-flags '("--cxx11" ; required by gtkmm + `(#:configure-flags '("--cxx11" ; required by gtkmm "--optimize" - "--no-phone-home" ; don't contact ardour.org - "--freedesktop" ; build .desktop file - "--test") ; build unit tests + "--no-phone-home" ; don't contact ardour.org + "--freedesktop" ; build .desktop file + "--test" ; build unit tests + "--use-external-libs") ; use system libraries #:phases (modify-phases %standard-phases (add-after 'unpack 'set-rpath-in-LDFLAGS @@ -745,7 +746,11 @@ (define-public ardour (install-file (string-append "build/gtk2_ardour/ardour" ver ".appdata.xml") (string-append share "/appdata/"))) - #t))) + #t)) + (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"))))) #:test-target "test")) (inputs (list alsa-lib @@ -759,14 +764,17 @@ (define-public ardour fftw fftwf flac + fluidsynth glibmm gtkmm-2 hicolor-icon-theme + hidapi jack-1 libarchive libart-lgpl libgnomecanvasmm liblo + libltc libogg libsamplerate libsndfile @@ -796,7 +804,8 @@ (define-public ardour ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("perl" ,perl) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("qm-dsp" ,qm-dsp))) (home-page "https://ardour.org") (synopsis "Digital audio workstation") (description -- 2.38.0