From patchwork Mon Apr 5 17:26:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 28328 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 C5FC427BC6A; Mon, 5 Apr 2021 18:27:14 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 E6EC527BC68 for ; Mon, 5 Apr 2021 18:27:08 +0100 (BST) Received: from localhost ([::1]:55338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTT0F-0003Qc-V6 for patchwork@mira.cbaines.net; Mon, 05 Apr 2021 13:27:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTT0A-0003QP-6N for guix-patches@gnu.org; Mon, 05 Apr 2021 13:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTT09-0006ZR-V9 for guix-patches@gnu.org; Mon, 05 Apr 2021 13:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lTT09-0008Pe-Pv for guix-patches@gnu.org; Mon, 05 Apr 2021 13:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47602] [PATCH] gnu: ardour: Update to 6.6. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Apr 2021 17:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47602 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47602@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.161764359832299 (code B ref -1); Mon, 05 Apr 2021 17:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Apr 2021 17:26:38 +0000 Received: from localhost ([127.0.0.1]:38511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTSzb-0008Oj-Nb for submit@debbugs.gnu.org; Mon, 05 Apr 2021 13:26:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:56904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTSzX-0008OZ-Np for submit@debbugs.gnu.org; Mon, 05 Apr 2021 13:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTSzX-0003M8-Gy for guix-patches@gnu.org; Mon, 05 Apr 2021 13:26:23 -0400 Received: from mout.gmx.net ([212.227.15.15]:46065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTSzV-0006EL-3z for guix-patches@gnu.org; Mon, 05 Apr 2021 13:26:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617643577; bh=R6nrkivtbhBKnJzU1NYCYiKtlWtCGPukdC6sOl4EDm4=; h=X-UI-Sender-Class:From:To:Subject:Date; b=TjeUoZQ62pUUjPF+HSfrmkjcnPwj/8vwEUwPEcu/F2wQ7ZvIVpZHJMzh5BEsV9P4W WzTWDtbf5WS/XivoJ+n359sw8CdYqd5h0zoGIt8WWhJWCTEhGbsJPT419xt+g0qh8z NMP/YZYbp6VNXScSXdZcswgd4W55vTcyRMNwxI6w= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MwwZd-1lmWP42q8h-00ySmS for ; Mon, 05 Apr 2021 19:26:17 +0200 User-agent: mu4e 1.4.15; emacs 27.2 From: Pierre Langlois Date: Mon, 05 Apr 2021 18:26:16 +0100 Message-ID: <87im501w3r.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xk4Qpk1+pgimUHh/E8we3jdEzTT5sPWu4dqwv6a4NYehFFCUAxB UhY9YQdBrjVjwfAKbxlgZEIgfBBbUdiSsqGSGi+fmhYD+AcQzbznaSxqUyflTxX0YFJHWHq 05rBOWLGLh/qcc4cYJEHqTBGq6f9bTu8JieDVAxT6aOd/PwRd5oZP6CEyUTvP5V6G1gbW34 KfelrMck1yfOK7fs8Va/Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:E+sftUMdJfw=:gspoRr1jc92zbenvi84ab7 VT+n1z4LksKBfmEw9z+BcngKYw9Kaf2HiR3KAg+/WZZhxhuxwWWHN8XluqdbN/e6eTC+53P8v ToVwYc6eaxNyrc++9xqnHSP0PxQPHkGQXLqNmupq2Z1z+IlwFuGxQYIGm7j/ARSfu/BJNaHhK 5ztK3wZzk6LHk6UN4K1StiJe8K2nU7eo1ByT4vhJZCmlU0oQSUe2CfpaW/SjNA7D9iJrXipZ8 j6jhjKin+rKef3N9vG2P7VeaqIsRVhD951XoDko8QF8DT4tV6GBt+XEQWvlcYQWG1puYZvsrR E1Kn6RoZUMN6E8ounfTPYfWbX2HQTQPkH77HMN6u17LB94Mhy5wrFg+j52E7NiH3cx2UqvSDt autBnoecq0GFihHYOnV02IHEdp2bcZwTi20JjT88mb4OLg7RByr+YxcX3wb8U3oTCyEPZOaBl owcV4UgaLKKBd8CbWUbWDSDNO8m+uVyC9i0t6gAc0Z5jOU/0mpRKfsti6XuzO+uV1vZQagigd kH+mM8DRSVNuE3a543aLH4eZRRcf9uLdyt2sS7PxbzziP7w6tZzyPGYc4Ek4/7TzKk46xqibI 7I/XYRvDvEyKUUtRS5shIGchDHF9tCkyxJLnk2tto2AfXJGJ4RzYt/Vg2C7ADQtJlvT6qauKA V+Ag8L50S9snm0QlHoVhKoz5hSh57RvtcLTXYQqtUrtxMFmpKoIUFUbiS/lz48A2pDu3qX25K ctiatexWoKpbi4YBXyFet1XIle7+9JtvhAjwmacDzb8dZd4CZH0U1DsFNda9HcKXpMwZWZ3Ye dRYQrSkictrpTkXqN26BQ17coZZaZzAM0Nc1+wlpNvT0mmBIW1PJ2PblAvG05N18opBvaSouF Cnkqk+CvdeUi/mQQlYXpjWSNT5IjGUf6fl31NivoT57fx/rSjfBVnVZCpb6ZRjoIRZJUIiKHS 22XCgFYPGfVA/vye9t5tRYWsgBlGX1QVAOdk93xBPhC6OTVYfDnMLcaIDuttLvJk7CnMXPaSm sIrByKQ+IwaW1CGI3DYf3lJ/7hM3VLVAriL34/9z0Hepb6rRPWHVABIECGuglgS8/hwpc3tto tj/JbciU9CEDuxL+hazTGVB/iPmht8YcwvSHjakhtzyfstaoijhzeQdDy6gsTedtSHbBOwOPw DcxGaLuinRuWngXGiYKZXR/ufCFcwkW322YUCA5wv97Clj4fy4srPTv0Cox8qeXH/U2McXgVU e/3UTjgVHEXPy9AH9 Received-SPF: pass client-ip=212.227.15.15; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Guix! Here are a couple of patches to update ardour. While reviewing the configure output to make sure we weren't missing any inputs I added libwebsockets, which also needed to be updated. Looking good? Thanks, Pierre From b8d0b8cdc06aced00f414745d0f1ad56120842f2 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 5 Apr 2021 15:55:24 +0100 Subject: [PATCH 2/2] gnu: ardour: Update to 6.6. * gnu/packages/audio.scm (ardour): Update to 6.6. [origin]: Use git protocol, https isn't available anymore. Adapt snippet. [arguments]: Add "--optimize" flags. Switch to python3. [inputs]: Add dbus, libwebsockets, openssl, pulseaudio and soundtouch. --- gnu/packages/audio.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eff45af80f..6e064f7175 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Brendan Tildesley -;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019, 2021 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Arun Isaac @@ -567,11 +567,11 @@ streams from live audio.") (define-public ardour (package (name "ardour") - (version "5.12") + (version "6.6") (source (origin (method git-fetch) (uri (git-reference - (url "https://git.ardour.org/ardour/ardour.git") + (url "git://git.ardour.org/ardour/ardour.git") (commit version))) (snippet ;; Ardour expects this file to exist at build time. The revision @@ -581,15 +581,16 @@ streams from live audio.") "libs/ardour/revision.cc" (lambda (port) (format port ,(string-append "#include \"ardour/revision.h\" -namespace ARDOUR { const char* revision = \"" version "\" ; }")) +namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")) #t))) (sha256 (base32 - "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr")) + "0k5rxh8b3d8si3lj01gfqj0pmd448d8sj4asnb205mwhwbfgn0cp")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments `(#:configure-flags '("--cxx11" ; required by gtkmm + "--optimize" "--no-phone-home" ; don't contact ardour.org "--freedesktop" ; build .desktop file "--test") ; build unit tests @@ -619,8 +620,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ver ".appdata.xml") (string-append share "/appdata/"))) #t))) - #:test-target "test" - #:python ,python-2)) + #:test-target "test")) (inputs `(("alsa-lib" ,alsa-lib) ("atkmm" ,atkmm) @@ -628,6 +628,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ("boost" ,boost) ("cairomm" ,cairomm) ("curl" ,curl) + ("dbus" ,dbus) ("eudev" ,eudev) ("fftw" ,fftw) ("fftwf" ,fftwf) @@ -644,17 +645,21 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ("libsndfile" ,libsndfile) ("libusb" ,libusb) ("libvorbis" ,libvorbis) + ("libwebsockets" ,libwebsockets) ("libxml2" ,libxml2) ("lilv" ,lilv) ("lrdf" ,lrdf) ("lv2" ,lv2) + ("openssl" ,openssl) ; Required by libwebsockets. ("pangomm" ,pangomm) ("python-rdflib" ,python-rdflib) + ("pulseaudio" ,pulseaudio) ("readline" ,readline) ("redland" ,redland) ("rubberband" ,rubberband) ("serd" ,serd) ("sord" ,sord) + ("soundtouch" ,soundtouch) ("sratom" ,sratom) ("suil" ,suil) ("taglib" ,taglib) -- 2.31.1