[bug#74251] [PATCH] Adding jack-mixer audio package

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

---
 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)
   #: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
+           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

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 4539 bytes --]

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 <divya@subvertising.org> 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)
>   #: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
>+           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
>

Divya Ranjan, Mathematics, Philosophy and Libre Software

[-- Attachment #2: Type: text/html, Size: 4971 bytes --]

[bug#74251] [PATCH] Adding jack-mixer audio package

[Ekaitz Zarraga]

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 <divya@subvertising.org> 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!

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 5914 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> 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
>> <divya@subvertising.org> 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,

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-audio-Add-jack-mixer.patch --]
[-- Type: text/x-patch, Size: 3272 bytes --]

From cd0d5e07739357d1bbb5e979746a4663a5000433 Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
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


[-- Attachment #3: Type: text/plain, Size: 60 bytes --]


-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Ekaitz Zarraga]

Hi,

> 
> 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,

The commit message is missing the body.
It should have something like:

* gnu/packages/audio.scm (jack-mixer): New variable.

Please add that and I'll do a further review.

Cheers,
Ekaitz

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> Hi,
>
>> 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,
>
> The commit message is missing the body.
> It should have something like:
>
> * gnu/packages/audio.scm (jack-mixer): New variable.
>
> Please add that and I'll do a further review.
>
> Cheers,
> Ekaitz
>

Does this look good?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-audio.scm-jack-mixer-New-variable.patch --]
[-- Type: text/x-patch, Size: 3295 bytes --]

From d0b5f7c3dd96ae9c84db41e1e9044b9e4fd9a078 Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
Date: Mon, 11 Nov 2024 01:11:15 +0000
Subject: [PATCH] gnu/packages/audio.scm (jack-mixer): New variable

---
 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


[-- Attachment #3: Type: text/plain, Size: 69 bytes --]


Regards,
-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Ekaitz Zarraga]

Sorry mate I didn't explain it properly.

The commit message has two parts: a title and a body.

The title you used before was correct, you were only missing the body. 
This is how the whole commit message should look like:

gnu: audio: Add jack-mixer

* gnu/packages/audio.scm (jack-mixer): New variable.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> Sorry mate I didn't explain it properly.
>
> The commit message has two parts: a title and a body.
>
> The title you used before was correct, you were only missing the
> body. This is how the whole commit message should look like:
>
> gnu: audio: Add jack-mixer
>
> * gnu/packages/audio.scm (jack-mixer): New variable.
>

Apologies I was confused with the title and the body, I usually only have titles in commit messages. Confirm if this one is appropriate.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-audio-Add-jack-mixer.patch --]
[-- Type: text/x-patch, Size: 3324 bytes --]

From 44110f38a40f673bd0d69dd68b11d3f3e555be77 Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
Date: Mon, 11 Nov 2024 01:11:15 +0000
Subject: [PATCH] gnu: audio: Add jack-mixer

* gnu/packages/audio.scm (jack-mixer): New variable
---
 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


[-- Attachment #3: Type: text/plain, Size: 69 bytes --]


Regards,
-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> Sorry mate I didn't explain it properly.
>
> The commit message has two parts: a title and a body.
>
> The title you used before was correct, you were only missing the
> body. This is how the whole commit message should look like:
>
> gnu: audio: Add jack-mixer
>
> * gnu/packages/audio.scm (jack-mixer): New variable.
>

Okay, I think this is the final patch.


Regards,

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-audio-Add-jack-mixer.patch --]
[-- Type: text/x-patch, Size: 3375 bytes --]

From 81db499ec6702efb38e56447b9ccc1253a6ee62c Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
Date: Mon, 11 Nov 2024 19:38:20 +0000
Subject: [PATCH] gnu: audio: Add jack-mixer

* gnu/packages/audio.scm (jack-mixer): New variable

Signed-off-by: Divya Ranjan <divya@subvertising.org>
---
 gnu/packages/audio.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 467dc4a74f..8548b2d8ed 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
+                         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 license:gpl2+)))
+
 (define-public jalv
   (package
     (name "jalv")
-- 
2.46.0


[-- Attachment #3: Type: text/plain, Size: 60 bytes --]


-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> Sorry mate I didn't explain it properly.
>
> The commit message has two parts: a title and a body.
>
> The title you used before was correct, you were only missing the
> body. This is how the whole commit message should look like:
>
> gnu: audio: Add jack-mixer
>
> * gnu/packages/audio.scm (jack-mixer): New variable.
>

Okay, I think this is the final patch.


Regards,

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-audio-Add-jack-mixer.patch --]
[-- Type: text/x-patch, Size: 3375 bytes --]

From 81db499ec6702efb38e56447b9ccc1253a6ee62c Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
Date: Mon, 11 Nov 2024 19:38:20 +0000
Subject: [PATCH] gnu: audio: Add jack-mixer

* gnu/packages/audio.scm (jack-mixer): New variable

Signed-off-by: Divya Ranjan <divya@subvertising.org>
---
 gnu/packages/audio.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 467dc4a74f..8548b2d8ed 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
+                         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 license:gpl2+)))
+
 (define-public jalv
   (package
     (name "jalv")
-- 
2.46.0


[-- Attachment #3: Type: text/plain, Size: 60 bytes --]


-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] [PATCH] Adding jack-mixer audio package

[Ekaitz Zarraga]

On 2024-11-11 20:42, Divya Ranjan wrote:
> Ekaitz Zarraga <ekaitz@elenq.tech> writes:
> 
>> Sorry mate I didn't explain it properly.
>>
>> The commit message has two parts: a title and a body.
>>
>> The title you used before was correct, you were only missing the
>> body. This is how the whole commit message should look like:
>>
>> gnu: audio: Add jack-mixer
>>
>> * gnu/packages/audio.scm (jack-mixer): New variable.
>>
> 
> Okay, I think this is the final patch.
> 
> 
> Regards,

Yes, this is almost there but there are still a couple of warnings by 
`guix lint`:

	jack-mixer@19: the source file name should contain the package name

This is complaining because when it clones the source code it is called 
"jack_mixer" but your package is called "jack-mixer" instead. You could 
fix it using something like this in the `origin`:

	(file-name (git-file-name name version))

If you add that and fix the indentation (you can use `guix style` for 
that), I think this is ready to go.

You are almost there!

PS: The other warning I think we can ignore for the moment. We have some 
other packages with the same warning I think it's because of the 
expansion of the `(,gtk+ "bin")

[bug#74251] [PATCH] Adding jack-mixer audio package

[Divya Ranjan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]

Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> On 2024-11-11 20:42, Divya Ranjan wrote:
>> Ekaitz Zarraga <ekaitz@elenq.tech> writes:
>> 
>>> Sorry mate I didn't explain it properly.
>>>
>>> The commit message has two parts: a title and a body.
>>>
>>> The title you used before was correct, you were only missing the
>>> body. This is how the whole commit message should look like:
>>>
>>> gnu: audio: Add jack-mixer
>>>
>>> * gnu/packages/audio.scm (jack-mixer): New variable.
>>>
>> Okay, I think this is the final patch.
>> Regards,
>
> Yes, this is almost there but there are still a couple of warnings by
> `guix lint`:
>
> 	jack-mixer@19: the source file name should contain the package name
>
> This is complaining because when it clones the source code it is
> called "jack_mixer" but your package is called "jack-mixer"
> instead. You could fix it using something like this in the `origin`:
>
> 	(file-name (git-file-name name version))
>
> If you add that and fix the indentation (you can use `guix style` for
> that), I think this is ready to go.
>
> You are almost there!
>
> PS: The other warning I think we can ignore for the moment. We have
> some other packages with the same warning I think it's because of the
> expansion of the `(,gtk+ "bin")
>

Added the necessary changes.

Regards,


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-audio-Add-jack-mixer.patch --]
[-- Type: text/x-patch, Size: 3565 bytes --]

From df1ddf6d262f432f6b777cd6b9999679679749a8 Mon Sep 17 00:00:00 2001
From: Divya Ranjan <divya@subvertising.org>
Date: Mon, 11 Nov 2024 23:44:44 +0000
Subject: [PATCH] gnu: audio: Add jack-mixer

* gnu/packages/audio.scm (jack-mixer): New variable

Change-Id: I0b278f8674c84a4f43f9d23afc900b0a53e11f7c
---
 gnu/packages/audio.scm | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 467dc4a74f..8ef87264a0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2772,6 +2772,65 @@ (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
+       (file-name (git-file-name name version))
+       (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
+                         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 license:gpl2+)))
+
 (define-public jalv
   (package
     (name "jalv")
-- 
2.46.0


[-- Attachment #3: Type: text/plain, Size: 60 bytes --]


-- 
Divya Ranjan,
Philosophy, Mathematics, Libre Software.

[bug#74251] QA review for 74251

[Ekaitz Zarraga]

user guix
usertag 74251 + reviewed-looks-good
thanks

Guix QA review form submission:


Items marked as checked: Lint warnings, Package builds, Commit messages, 
New package licenses, New package tests, New package synopsis and 
descriptions
-- 
ElenQ Technology

[bug#74251] QA review for 74251

[Ekaitz Zarraga]

user guix
usertag 74251 + reviewed-looks-good
thanks

Guix QA review form submission:


Items marked as checked: Lint warnings, Package builds, Commit messages, 
New package licenses, New package tests, New package synopsis and 
descriptions
-- 
ElenQ Technology

bug#74251: Close

[Andreas Enge]

Pushed, thanks for the patch and the reviewing work!

Andreas