From patchwork Mon Nov 11 01:17:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Divya Ranjan X-Patchwork-Id: 70212 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 63EB427BBE2; Mon, 11 Nov 2024 01:18:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4AD8927BBE9 for ; Mon, 11 Nov 2024 01:18:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAJ4B-0003UU-VC; Sun, 10 Nov 2024 20:18:08 -0500 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 1tAJ48-0003UC-4N for guix-patches@gnu.org; Sun, 10 Nov 2024 20:18:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAJ47-0007k2-SK for guix-patches@gnu.org; Sun, 10 Nov 2024 20:18:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=LzW748fdanxhev6zSqHGd+mCdI+l7ZGD8IbeBSFxNYI=; b=r2hhY5jiIlxCKgbpKLU/i4o+Z0moOfa/n2CA0XUFYRpaQFjVAOD4DQ+bP84eXWG9Gqj38yLulhoHAPYTxaXuN/6yCIFjHoIJaDfNs9kgAmRbzQmTKMfFtn8OoXZVg91PjFXFgPV65u6MhHxKVe5v+T5eQWVx9QvRSsBLTOuRFts1DaFwq/zN1MhuE/ZsAuMDA6J3xx7hFpWtl0PWYm1bLvHUgIIYX62qfXw7noMDsCOE+j+5eZIbS2oEyCTq5ImjbMxgNNJotXp4BSYhRYPavfJgtdD8ZpClfdaclFHib7busSpSBLsIGT9KS3Lq/zAA8xn7GBjpDBQ20J/Ie86PzQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAJ45-00008T-T4 for guix-patches@gnu.org; Sun, 10 Nov 2024 20:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74251] [PATCH] Adding jack-mixer audio package Resent-From: Divya Ranjan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 01:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74251 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: 74251@debbugs.gnu.org Received: via spool by 74251-submit@debbugs.gnu.org id=B74251.1731287852482 (code B ref 74251); Mon, 11 Nov 2024 01:18:01 +0000 Received: (at 74251) by debbugs.gnu.org; 11 Nov 2024 01:17:32 +0000 Received: from localhost ([127.0.0.1]:57173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAJ3b-00007g-Ro for submit@debbugs.gnu.org; Sun, 10 Nov 2024 20:17:32 -0500 Received: from confino.investici.org ([93.190.126.19]:55113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAJ3W-00007S-LN for 74251@debbugs.gnu.org; Sun, 10 Nov 2024 20:17:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subvertising.org; s=stigmate; t=1731287837; bh=LzW748fdanxhev6zSqHGd+mCdI+l7ZGD8IbeBSFxNYI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ZKZy9fU2C9hunfUliCQnXOkFCh0YB84tDhEaBbP4VILsdS29EwVll2BvHAJw8azFs dgk5O50oaM+Hvr/TBZEZlWVyn53dKWmz/tQvl5oXWslvpmOGIkqw7IIHPNIzC4fa7y wd4+JGvuRSdlJW3RjhaBGFVv0wZqUOaj1IZxPymM= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4Xms8s1mywz1128; Mon, 11 Nov 2024 01:17:17 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: divya@subvertising.org) by localhost (Postfix) with ESMTPSA id 4Xms8r42V1z1121; Mon, 11 Nov 2024 01:17:16 +0000 (UTC) In-Reply-To: (Ekaitz Zarraga's message of "Sat, 9 Nov 2024 19:20:42 +0100") References: Date: Mon, 11 Nov 2024 01:17:07 +0000 Message-ID: <87r07ibmcs.fsf@subvertising.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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: , Reply-to: Divya Ranjan X-ACL-Warn: , Divya Ranjan via Guix-patches X-Patchwork-Original-From: Divya Ranjan via Guix-patches via From: Divya Ranjan 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 Ekaitz Zarraga writes: > Hi, > > The commit message should follow the Changelog format as described the > Submitting-Patches section of the manual. > > That said: > >> Hello Guix devs, >> Apologies, I forgot to `--annotate` the git send-email, the >> following patch adds the jack-mixer application to the `(gnu >> packages audio)`. It's a python package built with meson, I've >> tested it with my system and it is deterministic. >> Let me know if any changes need to be done. >> P.S: CC me, since I'm not subscribed to the mailing list. >> Regards, >> On 8 November 2024 00:01:01 GMT, Divya Ranjan >> wrote: >> >--- >> > gnu/packages/audio.scm | 68 ++++++++++++++++++++++++++++++++++++++++++ >> > 1 file changed, 68 insertions(+) >> > >> >diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm >> >index 467dc4a74f..70477d1071 100644 >> >--- a/gnu/packages/audio.scm >> >+++ b/gnu/packages/audio.scm >> >@@ -79,6 +79,7 @@ (define-module (gnu packages audio) >> > #:use-module (gnu packages check) >> > #:use-module (gnu packages cdrom) >> > #:use-module (gnu packages compression) >> >+ #:use-module (gnu packages commencement) > > This is already included in the `build-system` so you don't need to > add it. In fact, it breaks Guix when you do :) > >> > #:use-module (gnu packages cpp) >> > #:use-module (gnu packages curl) >> > #:use-module (gnu packages dbm) >> >@@ -160,6 +161,7 @@ (define-module (gnu packages audio) >> > #:use-module (guix build-system python) >> > #:use-module (guix build-system trivial) >> > #:use-module (guix build-system waf) >> >+ #:use-module (guix build utils) >> > #:use-module (guix download) >> > #:use-module (guix gexp) >> > #:use-module (guix git-download) >> >@@ -2772,6 +2774,72 @@ (define-public jacktrip >> > audio signal streaming.") >> > (license (list license:gpl3+ license:lgpl3 license:expat)))) >> > >+(define-public jack-mixer >> >+ (package >> >+ (name "jack-mixer") >> >+ (version "19") >> >+ (source >> >+ (origin >> >+ (method git-fetch) >> >+ (uri (git-reference >> >+ (url "https://github.com/jack-mixer/jack_mixer") >> >+ (commit (string-append "release-" version)))) >> >+ (sha256 >> >+ (base32 "18m6a9asbwaslw418i2w04kgc6jgdpw01i3kawdqy903kw66hnhj")))) >> >+ (build-system meson-build-system) >> >+ (arguments >> >+ (list >> >+ #:build-type "release" >> >+ #:phases #~(modify-phases %standard-phases >> >+ ;; Replaces hardcoded path with /gnu/store >> >+ (add-after 'unpack 'path-patch >> >+ (lambda _ >> >+ (substitute* '("meson.build") >> >+ (("'/', 'etc', 'xdg'") >> >+ (string-append "'" >> >+ #$output "'"))))) >> >+ >> >+ ;; To wrap the paths for python and GTK >> >+ (add-after 'install 'wrap-path >> >+ (lambda* (#:key outputs #:allow-other-keys) >> >+ (let* ((out (assoc-ref outputs "out")) >> >+ (bin (string-append out "/bin/")) >> >+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")) >> >+ (version #$(version-major+minor (package-version >> >+ (this-package-input >> >+ "python")))) >> >+ (lib (string-append out "/lib/python" version >> >+ "/site-packages"))) >> >+ (wrap-program (string-append bin "jack_mixer") >> >+ `("GUIX_PYTHONPATH" ":" prefix >> >+ (,(getenv "GUIX_PYTHONPATH") ,lib)) >> >+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) >> >+ (native-inputs >> >+ (list gcc-toolchain > > As said, remove gcc-toolchain > >> >+ pkg-config >> >+ python-cython >> >+ python-docutils >> >+ gnu-gettext >> >+ glib)) >> >+ (propagated-inputs >> >+ (list gtk+ >> >+ `(,gtk+ "bin") ;; Required during runtime. >> >+ python >> >+ bash-minimal >> >+ python-wrapper >> >+ python-pygobject >> >+ python-pycairo >> >+ python-platformdirs ;; Required to save sessions. >> >+ jack-2)) >> >+ (synopsis >> >+ "JACK Mixer: A multi-channel audio mixer for the JACK Audio Connection Kit") >> >+ (description >> >+ "The jack_mixer is a GTK+ JACK audio mixer app with a look & handling >> >+similar to hardware mixing desks. It has lot of useful features, apart >> >+from being able to mix multiple JACK audio streams.") >> >+ (home-page "https://rdio.space/jackmixer/") >> >+ (license license:gpl2+))) >> >+ >> > (define-public jalv >> > (package >> > (name "jalv") >> >-- >2.46.0 > > Also when running `./pre-inst-env guix lint jack-mixer` there are > several problems with the package. > > Some you can fix with `./pre-inst-env style jack-mixer` but some > others you have to fix by hand: > > guix/gnu/packages/audio.scm:2777:2: jack-mixer@19: 'gettext' > should probably switched for its minimal variant > gnu/packages/audio.scm:2777:2: jack-mixer@19: "bash-minimal" > should be in 'inputs' when 'wrap-program' is used > ... > > Please, run the linter and fix the problems. > > Thanks for the patch! > Thank you for reminding me about the linter issues and the fact that gcc stuff doesn’t need to be added, I’ve made the changes in the attached patch. Also, let me know if the commit message is okay. Regards, From cd0d5e07739357d1bbb5e979746a4663a5000433 Mon Sep 17 00:00:00 2001 From: Divya Ranjan Date: Mon, 11 Nov 2024 01:11:15 +0000 Subject: [PATCH] gnu: audio: Add jack-mixer --- gnu/packages/audio.scm | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 467dc4a74f..f97bbb4126 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2772,6 +2772,66 @@ (define-public jacktrip audio signal streaming.") (license (list license:gpl3+ license:lgpl3 license:expat)))) +(define-public jack-mixer + (package + (name "jack-mixer") + (version "19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jack-mixer/jack_mixer") + (commit (string-append "release-" version)))) + (sha256 + (base32 "18m6a9asbwaslw418i2w04kgc6jgdpw01i3kawdqy903kw66hnhj")))) + (build-system meson-build-system) + (arguments + (list + #:build-type "release" + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'path-patch + (lambda _ + (substitute* '("meson.build") + (("'/', 'etc', 'xdg'") + (string-append "'" + #$output "'"))))) + (add-after 'install 'wrap-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (version #$(version-major+minor (package-version + (this-package-input + "python")))) + (lib (string-append out "/lib/python" version + "/site-packages"))) + (wrap-program (string-append bin "jack_mixer") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH") ,lib)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) + (native-inputs (list pkg-config + python-cython + python-docutils + gnu-gettext-minimal + glib)) + (inputs (list bash-minimal)) + (propagated-inputs (list gtk+ + `(,gtk+ "bin") + python + python-wrapper + python-pygobject + python-pycairo + python-platformdirs + jack-2)) + (synopsis + "JACK Mixer: A multi-channel audio mixer for the JACK Audio Connection Kit") + (description + "The jack_mixer is a GTK+ JACK audio mixer app with a look & handling +similar to hardware mixing desks. It has lot of useful features, apart +from being able to mix multiple JACK audio streams.") + (home-page "https://rdio.space/jackmixer/") + (license licens:gpl2+))) + (define-public jalv (package (name "jalv") -- 2.46.0