[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: qemu: Add pulseaudio support. --]
[-- Type: text/x-patch, Size: 1677 bytes --]

From 2eff4caca543d9909758a4f2eb6f953467a309d7 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 8 Dec 2017 18:51:10 +0300
Subject: [PATCH] gnu: qemu: Add pulseaudio support.

* gnu/packages/virtualization.scm (qemu): Add pulseaudio support.
---
 gnu/packages/virtualization.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 85563dde6..1a8e5f73b 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -51,6 +51,7 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages selinux)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages spice)
@@ -98,7 +99,11 @@
      '(;; Running tests in parallel can occasionally lead to failures, like:
        ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
        #:parallel-tests? #f
-       #:configure-flags '("--enable-usb-redir" "--enable-opengl")
+       #:configure-flags
+       (list "--enable-usb-redir"
+             "--enable-opengl"
+             (string-append "--audio-drv-list="
+                            (string-join (list "alsa" "pa" "sdl") ",")))
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -166,6 +171,7 @@
        ("ncurses" ,ncurses)
        ;; ("pciutils" ,pciutils)
        ("pixman" ,pixman)
+       ("pulseaudio" ,pulseaudio)
        ("sdl" ,sdl)
        ("spice" ,spice)
        ("usbredir" ,usbredir)
-- 
2.15.1

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Marius Bakke]

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

Oleg Pykhalov <go.wigust@gmail.com> writes:

> From 2eff4caca543d9909758a4f2eb6f953467a309d7 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Fri, 8 Dec 2017 18:51:10 +0300
> Subject: [PATCH] gnu: qemu: Add pulseaudio support.
>
> * gnu/packages/virtualization.scm (qemu): Add pulseaudio support.

Please mention the change to [inputs] and [arguments] here.

[...]

> @@ -98,7 +99,11 @@
>       '(;; Running tests in parallel can occasionally lead to failures, like:
>         ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
>         #:parallel-tests? #f
> -       #:configure-flags '("--enable-usb-redir" "--enable-opengl")
> +       #:configure-flags
> +       (list "--enable-usb-redir"
> +             "--enable-opengl"
> +             (string-append "--audio-drv-list="
> +                            (string-join (list "alsa" "pa" "sdl") ",")))

OK!

>         #:phases
>         (modify-phases %standard-phases
>           (replace 'configure
> @@ -166,6 +171,7 @@
>         ("ncurses" ,ncurses)
>         ;; ("pciutils" ,pciutils)
>         ("pixman" ,pixman)
> +       ("pulseaudio" ,pulseaudio)

I see pulseaudio is already in Qemus closure, so this does not add
anything.  LGTM!

>         ("sdl" ,sdl)
>         ("spice" ,spice)
>         ("usbredir" ,usbredir)
> -- 
> 2.15.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Oleg Pykhalov]

[-- Attachment #1.1: Type: text/plain, Size: 1882 bytes --]

Hello Marius,

apologies for a long reply.  I fix a comment and have a question about
clojure.  Also a new patch is attached.

Marius Bakke <mbakke@fastmail.com> writes:

> Oleg Pykhalov <go.wigust@gmail.com> writes:
>
>> From 2eff4caca543d9909758a4f2eb6f953467a309d7 Mon Sep 17 00:00:00 2001
>> From: Oleg Pykhalov <go.wigust@gmail.com>
>> Date: Fri, 8 Dec 2017 18:51:10 +0300
>> Subject: [PATCH] gnu: qemu: Add pulseaudio support.
>>
>> * gnu/packages/virtualization.scm (qemu): Add pulseaudio support.
>
> Please mention the change to [inputs] and [arguments] here.

OK.

[...]

>>         #:phases
>>         (modify-phases %standard-phases
>>           (replace 'configure
>> @@ -166,6 +171,7 @@
>>         ("ncurses" ,ncurses)
>>         ;; ("pciutils" ,pciutils)
>>         ("pixman" ,pixman)
>> +       ("pulseaudio" ,pulseaudio)
>
> I see pulseaudio is already in Qemus closure,

How do you see this?

Is that what do you use?
--8<---------------cut here---------------start------------->8---
guix graph --type=references pulseaudio | dot -Tsvg > pulseaudio.svg
--8<---------------cut here---------------end--------------->8---

> so this does not add anything.  LGTM!

Hm, seems it doesn't.
--8<---------------cut here---------------start------------->8---
starting phase `configure'

ERROR: pa check failed
       Make sure to have the pa libs and headers installed.

phase `configure' failed after 1.8 seconds
builder for `/gnu/store/zy7p2f4vhnmy154lmgjyhz26y41ngcjg-qemu-2.10.2.drv' failed with exit code 1
@ build-failed /gnu/store/zy7p2f4vhnmy154lmgjyhz26y41ngcjg-qemu-2.10.2.drv - 1 builder for `/gnu/store/zy7p2f4vhnmy154lmgjyhz26y41ngcjg-qemu-2.10.2.drv' failed with exit code 1
guix build: error: build failed: build of `/gnu/store/zy7p2f4vhnmy154lmgjyhz26y41ngcjg-qemu-2.10.2.drv' failed
--8<---------------cut here---------------end--------------->8---

[...]


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] gnu: qemu: Add pulseaudio support. --]
[-- Type: text/x-patch, Size: 2121 bytes --]

From 69c18f461f6a00c7dd25b86e50be95a38d0ca445 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 8 Dec 2017 18:51:10 +0300
Subject: [PATCH] gnu: qemu: Add pulseaudio support.

* gnu/packages/virtualization.scm (qemu)[arguments]: Add pulseaudio support.
[inputs]: Add pulseaudio.
---
 gnu/packages/virtualization.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f4fd4c336..97263382d 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -52,6 +52,7 @@
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages selinux)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages spice)
@@ -96,10 +97,13 @@
      '(;; Running tests in parallel can occasionally lead to failures, like:
        ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
        #:parallel-tests? #f
-       #:configure-flags (list "--enable-usb-redir" "--enable-opengl"
-                               (string-append "--smbd="
-                                              (assoc-ref %outputs "out")
-                                              "/libexec/samba-wrapper"))
+       #:configure-flags
+       (list "--enable-usb-redir"
+             "--enable-opengl"
+             (string-append "--smbd=" (assoc-ref %outputs "out")
+                            "/libexec/samba-wrapper")
+             (string-append "--audio-drv-list="
+                            (string-join (list "alsa" "pa" "sdl") ",")))
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -181,6 +185,7 @@ exec smbd $@")))
        ("ncurses" ,ncurses)
        ;; ("pciutils" ,pciutils)
        ("pixman" ,pixman)
+       ("pulseaudio" ,pulseaudio)
        ("sdl" ,sdl)
        ("spice" ,spice)
        ("usbredir" ,usbredir)
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 15 bytes --]


Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Marius Bakke]

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

Oleg Pykhalov <go.wigust@gmail.com> writes:

>>>         #:phases
>>>         (modify-phases %standard-phases
>>>           (replace 'configure
>>> @@ -166,6 +171,7 @@
>>>         ("ncurses" ,ncurses)
>>>         ;; ("pciutils" ,pciutils)
>>>         ("pixman" ,pixman)
>>> +       ("pulseaudio" ,pulseaudio)
>>
>> I see pulseaudio is already in Qemus closure,
>
> How do you see this?
>
> Is that what do you use?
> --8<---------------cut here---------------start------------->8---
> guix graph --type=references pulseaudio | dot -Tsvg > pulseaudio.svg
> --8<---------------cut here---------------end--------------->8---

I used `guix size qemu | grep pulseaudio`.

However "qemu-minimal" does not include pulseaudio, which increases the
size by about 25%.  Can you drop the input from qemu-minimal at the same
time?  Unfortunately we might have to override #:configure-flags as well.

[...]

> @@ -96,10 +97,13 @@
>       '(;; Running tests in parallel can occasionally lead to failures, like:
>         ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
>         #:parallel-tests? #f
> -       #:configure-flags (list "--enable-usb-redir" "--enable-opengl"
> -                               (string-append "--smbd="
> -                                              (assoc-ref %outputs "out")
> -                                              "/libexec/samba-wrapper"))
> +       #:configure-flags
> +       (list "--enable-usb-redir"
> +             "--enable-opengl"
> +             (string-append "--smbd=" (assoc-ref %outputs "out")
> +                            "/libexec/samba-wrapper")
> +             (string-append "--audio-drv-list="
> +                            (string-join (list "alsa" "pa" "sdl") ",")))

Nit-pick: I don't really see the benefit of using string-join here.  But
no strong opinion.  However: use '() instead of (list ...) when the
elements do not need to be evaluated.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Oleg Pykhalov]

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

>>>>> "Marius" == Marius Bakke <mbakke@fastmail.com> writes:

    > I see pulseaudio is already in Qemus closure, I used `guix size
    > qemu | grep pulseaudio`.  However "qemu-minimal" does not include
    > pulseaudio, which increases the size by about 25%.  Can you drop
    > the input from qemu-minimal at the same time?

For some unknown to me reason, “qemu-minimal” closure doesn't contain
“pulseaudio” according to my investigation:
--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix size qemu-minimal
store item                                                       total    self
/gnu/store/30sahk57a45xx205n7mmv3xcpch51g08-qemu-minimal-2.10.2    185.3    66.6  35.9%
/gnu/store/n6nvxlk2j8ysffjh3jphn1k5silnakh6-glibc-2.25              38.5    37.1  20.0%
/gnu/store/3x53yv4v144c9xp02rs64z7j597kkqax-gcc-5.4.0-lib           68.6    30.1  16.2%
/gnu/store/azbfh3i72lbaqvhgg5m7p6ymmqq0ii6q-glib-2.52.3            111.9    13.8   7.5%
/gnu/store/zbywrj6klakskj0sppq56viqh9l56jl0-util-linux-2.30.1       87.7    12.1   6.5%
/gnu/store/09j7scnl3hahcmql986fsjpzj6gqsmzv-ncurses-6.0             74.3     5.7   3.1%
/gnu/store/b7y66db86k57vbb03nr4bfn9svmks4gf-bash-4.4.12             81.0     5.4   2.9%
/gnu/store/an52j0jrvd23qypbidd5f20k2wi75vh9-pcre-8.40               72.1     3.4   1.9%
/gnu/store/2p1ljs69x19v11r0rgqh7k3v6ggfqizq-libjpeg-turbo-1.5.3     72.0     3.4   1.8%
/gnu/store/w8kii3hjvmh50yxs52gkdywkq9jc7s19-pixman-0.34.0           70.2     1.6   0.9%
/gnu/store/zhrajv6qf2hzn9c3g2bb07559hyrz5xp-bash-static-4.4.12       1.4     1.4   0.8%
/gnu/store/mipizipnr4y2hly9b429j8id1albbgqi-readline-7.0            75.6     1.3   0.7%
/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12     39.5     1.0   0.5%
/gnu/store/vdqy6r4g7357nsjjh4d1gfqj9hhw1vk8-libseccomp-2.3.2        69.5     0.8   0.5%
/gnu/store/b9ww6qv1ii9v6n45kin7543vkf6jfnd3-libpng-1.6.29           70.8     0.8   0.4%
/gnu/store/sfx1wh27i6gsrk21p87rdyikc64v7d51-zlib-1.2.11             69.0     0.4   0.2%
/gnu/store/jnbb8ffxxvrw2b4z18zn0g08kqk9rsgl-libffi-3.2.1            68.8     0.1   0.1%
/gnu/store/hxn2viwl04nwswpjkfg0iyyhm815yaza-libcap-2.25             68.8     0.1   0.1%
/gnu/store/fq4zk6aqrgim67aiqri37vbbk4gdkfny-libaio-0.3.110           0.0     0.0   0.0%
total: 185.3 MiB
--8<---------------cut here---------------end--------------->8---

I could assume because “(package-arguments qemu-minimal)” shows a
totally different “#:configure-flags” than “(package-arguments qemu)”.
Particularly doesn't contain “--audio-drv-list=alsa,pa,sdl”.

    > Unfortunately we might have to override #:configure-flags as well.

No (see above).

    >> + (string-append "--audio-drv-list="
    >> +                (string-join (list "alsa" "pa" "sdl") ",")))

    > Nit-pick: I don't really see the benefit of using string-join
    > here.

Agree.

    > But no strong opinion.  However: use '() instead of (list
    > ...) when the elements do not need to be evaluated.

Thanks, I will use a quote.

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Marius Bakke]

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

Oleg Pykhalov <go.wigust@gmail.com> writes:

>>>>>> "Marius" == Marius Bakke <mbakke@fastmail.com> writes:
>
>     > I see pulseaudio is already in Qemus closure, I used `guix size
>     > qemu | grep pulseaudio`.  However "qemu-minimal" does not include
>     > pulseaudio, which increases the size by about 25%.  Can you drop
>     > the input from qemu-minimal at the same time?
>
> For some unknown to me reason, “qemu-minimal” closure doesn't contain
> “pulseaudio” according to my investigation:
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix size qemu-minimal
> store item                                                       total    self
> /gnu/store/30sahk57a45xx205n7mmv3xcpch51g08-qemu-minimal-2.10.2    185.3    66.6  35.9%
> /gnu/store/n6nvxlk2j8ysffjh3jphn1k5silnakh6-glibc-2.25              38.5    37.1  20.0%
> /gnu/store/3x53yv4v144c9xp02rs64z7j597kkqax-gcc-5.4.0-lib           68.6    30.1  16.2%
> /gnu/store/azbfh3i72lbaqvhgg5m7p6ymmqq0ii6q-glib-2.52.3            111.9    13.8   7.5%
> /gnu/store/zbywrj6klakskj0sppq56viqh9l56jl0-util-linux-2.30.1       87.7    12.1   6.5%
> /gnu/store/09j7scnl3hahcmql986fsjpzj6gqsmzv-ncurses-6.0             74.3     5.7   3.1%
> /gnu/store/b7y66db86k57vbb03nr4bfn9svmks4gf-bash-4.4.12             81.0     5.4   2.9%
> /gnu/store/an52j0jrvd23qypbidd5f20k2wi75vh9-pcre-8.40               72.1     3.4   1.9%
> /gnu/store/2p1ljs69x19v11r0rgqh7k3v6ggfqizq-libjpeg-turbo-1.5.3     72.0     3.4   1.8%
> /gnu/store/w8kii3hjvmh50yxs52gkdywkq9jc7s19-pixman-0.34.0           70.2     1.6   0.9%
> /gnu/store/zhrajv6qf2hzn9c3g2bb07559hyrz5xp-bash-static-4.4.12       1.4     1.4   0.8%
> /gnu/store/mipizipnr4y2hly9b429j8id1albbgqi-readline-7.0            75.6     1.3   0.7%
> /gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12     39.5     1.0   0.5%
> /gnu/store/vdqy6r4g7357nsjjh4d1gfqj9hhw1vk8-libseccomp-2.3.2        69.5     0.8   0.5%
> /gnu/store/b9ww6qv1ii9v6n45kin7543vkf6jfnd3-libpng-1.6.29           70.8     0.8   0.4%
> /gnu/store/sfx1wh27i6gsrk21p87rdyikc64v7d51-zlib-1.2.11             69.0     0.4   0.2%
> /gnu/store/jnbb8ffxxvrw2b4z18zn0g08kqk9rsgl-libffi-3.2.1            68.8     0.1   0.1%
> /gnu/store/hxn2viwl04nwswpjkfg0iyyhm815yaza-libcap-2.25             68.8     0.1   0.1%
> /gnu/store/fq4zk6aqrgim67aiqri37vbbk4gdkfny-libaio-0.3.110           0.0     0.0   0.0%
> total: 185.3 MiB
> --8<---------------cut here---------------end--------------->8---
>
> I could assume because “(package-arguments qemu-minimal)” shows a
> totally different “#:configure-flags” than “(package-arguments qemu)”.
> Particularly doesn't contain “--audio-drv-list=alsa,pa,sdl”.

Oh, ok.  That's great.  Let's still drop it from the inputs of
qemu-minimal so it doesn't accidentally end up getting referenced in the
future.  The patch LGTM with that change.

Sorry for the late reply, and thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#29678] [PATCH] gnu: qemu: Add pulseaudio support.

[Oleg Pykhalov]

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

Hello Marius,

Marius Bakke <mbakke@fastmail.com> writes:

  > Oh, ok.  That's great.  Let's still drop it from the inputs of
  > qemu-minimal so it doesn't accidentally end up getting referenced in the
  > future.

OK.

  > The patch LGTM with that change.

Pushed as 28e3569f1f2640f814b358cd934c386ddb65def1

I'll close the bug report.

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]