From patchwork Tue Apr 11 08:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 49090 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 4532417497; Tue, 11 Apr 2023 09:11:45 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED,URIBL_SBL_A 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 6085F1748A for ; Tue, 11 Apr 2023 09:11:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm95q-0001gj-Eh; Tue, 11 Apr 2023 04:11:10 -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 1pm95n-0001f6-4v for guix-patches@gnu.org; Tue, 11 Apr 2023 04:11:07 -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 1pm95k-0002Yi-9I for guix-patches@gnu.org; Tue, 11 Apr 2023 04:11:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm95k-0001ZT-4h for guix-patches@gnu.org; Tue, 11 Apr 2023 04:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62771] [PATCH 6/9] gnu: rubberband: Update to 3.2.1. Resent-From: 'Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 08:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62771@debbugs.gnu.org Cc: Brendan Tildesley Received: via spool by 62771-submit@debbugs.gnu.org id=B62771.16812006195926 (code B ref 62771); Tue, 11 Apr 2023 08:11:04 +0000 Received: (at 62771) by debbugs.gnu.org; 11 Apr 2023 08:10:19 +0000 Received: from localhost ([127.0.0.1]:36566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm951-0001XV-Bq for submit@debbugs.gnu.org; Tue, 11 Apr 2023 04:10:19 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:45430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm94y-0001Wc-CG for 62771@debbugs.gnu.org; Tue, 11 Apr 2023 04:10:16 -0400 Received: from smtp2.mailbox.org (unknown [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4Pwdmx09g7z9sZH; Tue, 11 Apr 2023 10:10:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1681200609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LIxsGaQvXe8lsGzVgciQMI97Ls1s2NTQJy1RQeQKi/c=; b=BKwIlHgb9tT5ClsymAScuuJFaqTdbhbZsIB09UVdV32mYAKrG2jcB3jJfsekTOphckeIui j24c672x+05bsfrYH40Lt09T45K+tUPxZ8V70LaDkGt/OezVkuZTQsmZNPlsu3IMk00cii J5Sudrt2zvr4FqK8KM+AjE1HFMIUaKx48PsMkV6ul15T7+oV7sTzaufpAmfFMg/5et6YgL b+rtZ26FObg08b/FkRvex0cil0tSwYX5yuvc8hMeTq085NI8MquDRa8DZce+C3ofr034ZC HI3nov1Jmdo+tigAxFqkoDML1w/GY5Vr3mQWqTpJ91Sh03MMTSHpG8g1VShKLw== From: 'Brendan Tildesley Date: Tue, 11 Apr 2023 18:09:52 +1000 Message-Id: <20230411080955.22584-5-mail@brendan.scot> In-Reply-To: <20230411080955.22584-1-mail@brendan.scot> References: <20230411080955.22584-1-mail@brendan.scot> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Brendan Tildesley * gnu/packages/audio.scm (rubberband): Update to 3.2.1 [origin]: Use current upstream repository location. [arguments]: Use libsamplerate over builtin resampler. Use guix fftw over bundled version. [inputs]: Add lv2 plugin support. Add fftw. [native-search-paths]: Add lv2 nad ladspa search paths. --- gnu/packages/audio.scm | 46 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e2d788bfeb..7d62617667 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -143,6 +143,7 @@ (define-module (gnu packages audio) #:use-module (guix build-system trivial) #:use-module (guix build-system waf) #:use-module (guix download) + #:use-module (guix hg-download) #:use-module (guix git-download) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) @@ -3663,33 +3664,38 @@ (define-public resample (define-public rubberband (package (name "rubberband") - (version "1.8.2") + (version "3.2.1") (source (origin - (method url-fetch) - (uri - (string-append "https://bitbucket.org/breakfastquay/rubberband/get/v" - version - ".tar.bz2")) - (file-name (string-append name "-" version ".tar.bz2")) + (method hg-fetch) + (uri (hg-reference + (url "https://hg.sr.ht/~breakfastquay/rubberband") + (changeset (string-append "v" version)))) + (file-name (hg-file-name name version)) (sha256 (base32 - "0462fmjnfqpv2qi0s6ny42drqarkr0xy9lw8frjmfgzyzl5n9294")))) - (build-system gnu-build-system) + "0zxq4d4i89s83r95vrb0h4zpkpqbsy2y2vralg30x57z3y2w702i")))) + (build-system meson-build-system) (arguments - `(#:tests? #f ; no check target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-jni-installation - ;; ‘make install’ unconditionally installs librubberband-jni.so, - ;; which is never built by ‘make all’. Skip it. - (lambda _ - (substitute* "Makefile.in" - ((".*cp -f \\$\\(JNI_TARGET\\).*") "")) - #t))))) + '(#:tests? #f ; missing boost unit test library + #:configure-flags + '("-Dresampler=libsamplerate" + "-Dfft=fftw" ; To avoid using bundled version + "-Ddefault_library=shared"))) ; Don't build static library (inputs - (list ladspa libsamplerate vamp)) + (list ladspa + libsamplerate + vamp + lv2 + fftw)) (native-inputs (list pkg-config)) + (native-search-paths + (list (search-path-specification + (variable "LV2_PATH") + (files '("lib/lv2"))) + (search-path-specification + (variable "LADSPA_PATH") + (files '("lib/ladspa"))))) (home-page "https://breakfastquay.com/rubberband/") (synopsis "Audio time-stretching and pitch-shifting library") (description