From patchwork Sun Aug 23 15:15:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 23743 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 69E6727BBE6; Sun, 23 Aug 2020 16:17:17 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id E7BD927BBE5 for ; Sun, 23 Aug 2020 16:17:16 +0100 (BST) Received: from localhost ([::1]:55352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9rkC-0006XX-5o for patchwork@mira.cbaines.net; Sun, 23 Aug 2020 11:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9rjy-0006Wb-SK for guix-patches@gnu.org; Sun, 23 Aug 2020 11:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k9rjy-0001A4-Il for guix-patches@gnu.org; Sun, 23 Aug 2020 11:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k9rjy-00058F-EY for guix-patches@gnu.org; Sun, 23 Aug 2020 11:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42997] [PATCH 1/2] gnu: muse-sequencer: Update to 3.1.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Aug 2020 15:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42997@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159819577319656 (code B ref -1); Sun, 23 Aug 2020 15:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Aug 2020 15:16:13 +0000 Received: from localhost ([127.0.0.1]:54909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9rjA-00056x-VL for submit@debbugs.gnu.org; Sun, 23 Aug 2020 11:16:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:33736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9rj9-00056o-FO for submit@debbugs.gnu.org; Sun, 23 Aug 2020 11:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9rj9-0005zv-92 for guix-patches@gnu.org; Sun, 23 Aug 2020 11:16:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9rj6-00015r-Tl for guix-patches@gnu.org; Sun, 23 Aug 2020 11:16:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8848F16005F for ; Sun, 23 Aug 2020 17:16:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1598195765; bh=hQsZqpWgc1jJyJCP3fl4uBB/D6/j3C13cUYf26utD80=; h=From:To:Cc:Subject:Date:From; b=bSb3x2g9sJHpf3eivcr1dXiy53Zv3D2/QGPVGEjn4oBqvXcOz50D78jDNoAEAji3W 66hdyoEOFOFEQK8J7f5fXf/FigYjzQMAQZsor4oPewwAZUtWjOegrjWi4ceLyvJMVj MzTPaWQ/P2F9kgqYCyB8T52n+6eJriYsBTBBD1ZNWfZ4tUf9FoCuVFlaYiArhsc10+ 0DtqZ2DGHrRVQ64bdCXzSm2p1PY4jbucom7qhxrn3nr5XiLdHWkPr3+8iBZhyVro53 RoZ+vLrAij2sILOxq3XqGedkNiJqwC4BHf69YdXcPXhOmKrrmPkUOFs685RWxxZY4x i0eAkytNqHmVQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BZJjv68hGz9rxL; Sun, 23 Aug 2020 17:16:03 +0200 (CEST) From: Vinicius Monego Date: Sun, 23 Aug 2020 12:15:51 -0300 Message-Id: <20200823151551.16314-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/23 11:16:05 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 * gnu/packages/music.scm (muse-sequencer): Update to 3.1.1. [arguments]: Set CMAKE_BUILD_TYPE to Release. Add stage to set LDFLAGS. Add stage to wrap executable. [inputs]: Sort alphabetically. --- This package is broken in the CI. I had to update the version to fix. There are still some rough edges, but it builds and is somewhat usable. gnu/packages/music.scm | 44 +++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ae8579cb47..7cc6d7b1ea 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -4127,7 +4128,7 @@ sample library.") (define-public muse-sequencer (package (name "muse-sequencer") - (version "3.0.0") + (version "3.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -4139,7 +4140,7 @@ sample library.") (file-name (git-file-name name version)) (sha256 (base32 - "1nninz8qyqlxxjdnrm79y3gr3056pga9l2fsqh674jd3cjvafya3")))) + "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there is no test target @@ -4147,27 +4148,44 @@ sample library.") (list "-DENABLE_LV2_SUPPLIED=OFF" "-DENABLE_RTAUDIO=OFF" ; FIXME: not packaged "-DENABLE_INSTPATCH=OFF" ; FIXME: not packaged - "-DENABLE_VST_NATIVE=OFF") + "-DENABLE_VST_NATIVE=OFF" + "-DCMAKE_BUILD_TYPE=Release") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "muse3")))))) + (lambda _ (chdir "muse3"))) + ;; Fix validate-runpath stage. + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" (assoc-ref outputs "out") + "/lib/muse-3.1/modules")))) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/muse3") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins/")))))))))) (inputs `(("alsa-lib" ,alsa-lib) - ("lash" ,lash) - ("jack" ,jack-1) - ("liblo" ,liblo) ("dssi" ,dssi) + ("fluidsynth" ,fluidsynth) + ("jack" ,jack-1) ("ladspa" ,ladspa) - ("lv2" ,lv2) - ("lilv" ,lilv) - ("sord" ,sord) - ("libsndfile" ,libsndfile) + ("lash" ,lash) + ("liblo" ,liblo) ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth) + ("libsndfile" ,libsndfile) + ("lilv" ,lilv) + ("lv2" ,lv2) ("pcre" ,pcre) + ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("sord" ,sord))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) From patchwork Sun Aug 23 15:17:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 23744 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 F3F0C27BBE6; Sun, 23 Aug 2020 16:19:07 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id C811627BBE5 for ; Sun, 23 Aug 2020 16:19:07 +0100 (BST) Received: from localhost ([::1]:56094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9rlz-0006uU-DC for patchwork@mira.cbaines.net; Sun, 23 Aug 2020 11:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9rlu-0006uM-1t for guix-patches@gnu.org; Sun, 23 Aug 2020 11:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k9rlt-0001IC-OC for guix-patches@gnu.org; Sun, 23 Aug 2020 11:19:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k9rlt-0005Bi-K3 for guix-patches@gnu.org; Sun, 23 Aug 2020 11:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42997] [PATCH 2/2] gnu: muse-sequencer: Add dependencies. References: <20200823151551.16314-1-monego@posteo.net> In-Reply-To: <20200823151551.16314-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Aug 2020 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42997@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 42997-submit@debbugs.gnu.org id=B42997.159819589819887 (code B ref 42997); Sun, 23 Aug 2020 15:19:01 +0000 Received: (at 42997) by debbugs.gnu.org; 23 Aug 2020 15:18:18 +0000 Received: from localhost ([127.0.0.1]:54914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9rlC-0005Ah-Dl for submit@debbugs.gnu.org; Sun, 23 Aug 2020 11:18:18 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k9rlA-0005AV-P8 for 42997@debbugs.gnu.org; Sun, 23 Aug 2020 11:18:17 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9B0BB240106 for <42997@debbugs.gnu.org>; Sun, 23 Aug 2020 17:18:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1598195890; bh=j5dmarou5w0m++dHonOCsCyJlj3CAI6XRgLhBfCYeKU=; h=From:To:Cc:Subject:Date:From; b=MlXjeJua1nMcbt7vzGV+6rPxccHTX+H6l4PC3BjdQ4uf56hkLEMGF73z3CmS6IxoS PqQHCrP/sYw5rwQBAc9hdMOhINF59AN0QdQnBSnc11d45lu5kGh7npouY/4vHuo2uG ggm/ZqINNOZlQPxnuatMfd8yT2NP79MtWPAQTFZuO/DKAtC35XrTFaeT7XTsqRSuuI yokYXvwbYs56fbIgY2tGe9WEgLA6p+b4o3TxjO9dX3FeIEqpn+Tho5cEwQpNy9mXzu OvbNCi897+u7KD/23DWDioT9X5rbFhURDT2CWt7+uaT4lx9wwCNo581LigcBamXJ4i qL4qCwzFNaAbg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BZJmJ6q5bz9rxc; Sun, 23 Aug 2020 17:18:08 +0200 (CEST) From: Vinicius Monego Date: Sun, 23 Aug 2020 12:17:45 -0300 Message-Id: <20200823151745.16679-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (muse-sequencer): Add dependencies. [arguments]: Fix RtAudio include path. [inputs]: Add glib, libinstpatch, lrdf, python, python-pyro4, rtaudio, rubberband. --- gnu/packages/music.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7cc6d7b1ea..31aaa130e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4146,14 +4146,17 @@ sample library.") `(#:tests? #f ; there is no test target #:configure-flags (list "-DENABLE_LV2_SUPPLIED=OFF" - "-DENABLE_RTAUDIO=OFF" ; FIXME: not packaged - "-DENABLE_INSTPATCH=OFF" ; FIXME: not packaged "-DENABLE_VST_NATIVE=OFF" "-DCMAKE_BUILD_TYPE=Release") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "muse3"))) + ;; Fix RtAudio include syntax. + (add-after 'chdir 'fix-rtaudio + (lambda _ + (substitute* "muse/driver/rtaudio.h" + (("rtaudio/RtAudio.h") "RtAudio.h")))) ;; Fix validate-runpath stage. (add-before 'configure 'set-LDFLAGS (lambda* (#:key inputs outputs #:allow-other-keys) @@ -4173,18 +4176,25 @@ sample library.") `(("alsa-lib" ,alsa-lib) ("dssi" ,dssi) ("fluidsynth" ,fluidsynth) + ("glib" ,glib) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lash" ,lash) + ("libinstpatch" ,libinstpatch) ("liblo" ,liblo) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("lilv" ,lilv) + ("lrdf" ,lrdf) ("lv2" ,lv2) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) + ("python" ,python) + ("python-pyro4" ,python-pyro4) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) + ("rtaudio" ,rtaudio) + ("rubberband" ,rubberband) ("sord" ,sord))) (native-inputs `(("pkg-config" ,pkg-config)