From patchwork Tue Oct 26 11:46:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thorsten Wilms X-Patchwork-Id: 34064 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 9BCD127BBE3; Tue, 26 Oct 2021 12:50:26 +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_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable 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 DE3F727BBE1 for ; Tue, 26 Oct 2021 12:50:25 +0100 (BST) Received: from localhost ([::1]:53992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfKyF-0003Us-Mw for patchwork@mira.cbaines.net; Tue, 26 Oct 2021 07:50:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfKvz-0003SA-GE for guix-patches@gnu.org; Tue, 26 Oct 2021 07:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfKvz-00078F-0x for guix-patches@gnu.org; Tue, 26 Oct 2021 07:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfKvy-0004nG-T9 for guix-patches@gnu.org; Tue, 26 Oct 2021 07:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51410] [PATCH 2/2] gnu: Update ingen. Resent-From: Thorsten Wilms Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Oct 2021 11:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51410 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51410@debbugs.gnu.org Cc: Thorsten Wilms Received: via spool by 51410-submit@debbugs.gnu.org id=B51410.163524883618194 (code B ref 51410); Tue, 26 Oct 2021 11:48:02 +0000 Received: (at 51410) by debbugs.gnu.org; 26 Oct 2021 11:47:16 +0000 Received: from localhost ([127.0.0.1]:45308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfKv9-0004jA-Ie for submit@debbugs.gnu.org; Tue, 26 Oct 2021 07:47:16 -0400 Received: from mout0.freenet.de ([195.4.92.90]:47878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfKv1-0004ik-6i for 51410@debbugs.gnu.org; Tue, 26 Oct 2021 07:47:03 -0400 Received: from [195.4.92.119] (helo=sub0.freenet.de) by mout0.freenet.de with esmtpa (ID t_w_@01019freenet.de) (port 25) (Exim 4.92 #3) id 1mfKv0-0006bb-M2 for 51410@debbugs.gnu.org; Tue, 26 Oct 2021 13:47:02 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freenet.de; s=mjaymdexmjqk; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BSWv2hylRFzRg2Ya8gGnW6fdlMl0NkNR22ZpK0f3JuM=; b=KoMI3Mz9rgYx1jKmmpdMiVYadx pCXXvGVDKTGgWPJt1ybzGNdiXQRu/ewe+fmIUvERaKND6S8MzVhmR9S9t+gLm2y4XOXKx0dIPO/46 nWmgDBLVzWDfXtCd0e+1Pi5I3D6KewRPehQEHTibKBt2/6hJuT3KETQR2+BurHgI1VEzV3F4vHdDd 2KAsjADWeT+8ab89NbH3Uu98PLHOoOU87LIkkHK1mGw9mGsUTsb4bOn4j/MBdqhkS0QYg/nwyETEZ 4Usl4eZ36R9HMyCw+twZ8oXVUuFWjNcGhR8FdVCUWeyfpVAlrU1NqO+vE3KEMq0vqul77v9V7zpds PljwX/Qw==; Received: from p200300e4f7124200b5ca35b4d0342189.dip0.t-ipconnect.de ([2003:e4:f712:4200:b5ca:35b4:d034:2189]:45598 helo=charly..) by sub0.freenet.de with esmtpsa (ID t_w_@01019freenet.de) (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (port 465) (Exim 4.92 #3) id 1mfKv0-00077z-Iz; Tue, 26 Oct 2021 13:47:02 +0200 From: Thorsten Wilms Date: Tue, 26 Oct 2021 13:46:48 +0200 Message-Id: <20211026114648.10604-2-t_w_@freenet.de> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211026114648.10604-1-t_w_@freenet.de> References: <20211026133037.52a02d63b8baa7a673901f46@freenet.de> <20211026114648.10604-1-t_w_@freenet.de> MIME-Version: 1.0 X-Originated-At: 2003:e4:f712:4200:b5ca:35b4:d034:2189!45598 X-FNSign: v=2 s=885FB2EA1A7CE8722A3CD3911B38D15E6D8153644BC210C2965D075C4E50ADD3 X-Scan-TS: Tue, 26 Oct 2021 13:47:02 +0200 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 * gnu/packages/music.scm (ingen): New revision, git-fetch recursive for waflib submodule, adjust wscript-patching. --- gnu/packages/music.scm | 80 ++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 07b85b87f6..d4f65a8d10 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Thomas Albers Raviola +;;; Copyright © 2021 Thorsten Wilms ;;; ;;; This file is part of GNU Guix. ;;; @@ -4529,7 +4530,7 @@ (define-public mod-utilities (license license:gpl2+)))) (define-public ingen - (let ((commit "cc4a4db33f4d126a07a4a498e053c5fb9a883be3") + (let ((commit "b760e11d5f9f4d25919a566ef727164da4376062") (revision "2")) (package (name "ingen") @@ -4539,51 +4540,46 @@ (define-public ingen (origin (method git-fetch) (uri (git-reference - (url "https://git.drobilla.net/ingen.git") - (commit commit))) + (url "https://gitlab.com/drobilla/ingen.git") + (commit commit) + ;; Include waflib submodule: + (recursive? #t))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1wg47vjw9djn99gbnsl2bcwj4xhdid61m4wrbn2nlp797flj91ic")))) + "1hk8z67ksqga88ivg4r5c87kx7hh1w0cifamm5awwz0583kv5rh9")))) (build-system waf-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; no "check" target - #:configure-flags (list "--no-webkit") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-wscript - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "wscript" - ;; FIXME: Our version of lv2specgen.py does not behave as - ;; expected. Maybe this requires a development version of - ;; LV2. - (("lv2specgen.py") "touch ingen.lv2/ingen.html; echo") - ;; Add libraries to RUNPATH. - (("^(.+)target.*= 'src/ingen/ingen'," line prefix) - (string-append prefix - "linkflags=[\"-Wl,-rpath=" - out "/lib" "\"]," line))) - (substitute* '("src/wscript" - "src/server/wscript") - ;; Add libraries to RUNPATH. - (("bld.env.PTHREAD_LINKFLAGS" line) - (string-append line - " + [\"-Wl,-rpath=" out "/lib" "\"]"))) - (substitute* "src/client/wscript" - ;; Add libraries to RUNPATH. - (("^(.+)target.*= 'ingen_client'," line prefix) - (string-append prefix - "linkflags=[\"-Wl,-rpath=" - out "/lib" "\"]," line))) - (substitute* "src/gui/wscript" - ;; Add libraries to RUNPATH. - (("^(.+)target.* = 'ingen_gui.*" line prefix) - (string-append prefix - "linkflags=[\"-Wl,-rpath=" - out "/lib" "\"]," line)))) - #t))))) + `(#:tests? #f ; no "check" target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-wscript + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "wscript" + ;; Add libraries to RUNPATH. + (("^(.+)source.*= 'src/ingen/ingen.cpp'," line prefix) + (string-append prefix + "linkflags=[\"-Wl,-rpath=" + out "/lib" "\"]," line))) + (substitute* '("src/wscript" + "src/server/wscript") + ;; Add libraries to RUNPATH. + (("bld.env.PTHREAD_LINKFLAGS" line) + (string-append line + " + [\"-Wl,-rpath=" out "/lib" "\"]"))) + (substitute* "src/client/wscript" + ;; Add libraries to RUNPATH. + (("^(.+)target.*= 'ingen_client'," line prefix) + (string-append prefix + "linkflags=[\"-Wl,-rpath=" + out "/lib" "\"]," line))) + (substitute* "src/gui/wscript" + ;; Add libraries to RUNPATH. + (("^(.+)target.* = 'ingen_gui.*" line prefix) + (string-append prefix + "linkflags=[\"-Wl,-rpath=" + out "/lib" "\"]," line))))#t))))) (inputs `(("boost" ,boost) ("python-rdflib" ,python-rdflib) @@ -4601,7 +4597,7 @@ (define-public ingen (native-inputs `(("pkg-config" ,pkg-config) ("python-pygments" ,python-pygments))) - (home-page "https://drobilla.net/software/ingen") + (home-page "https://drobilla.net/software/ingen.html") (synopsis "Modular audio processing system") (description "Ingen is a modular audio processing system for JACK and LV2 based systems. Ingen is built around LV2 technology and a strict