Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Sun, 22 Sep 2019 02:12:41
Message-Id: 1569118332.79eb2ebdcc7ed50c2a2ca66ebbb6691921fbbf40.tamiko@gentoo
1 commit: 79eb2ebdcc7ed50c2a2ca66ebbb6691921fbbf40
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 21 23:00:22 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 22 02:12:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79eb2ebd
7
8 app-emulation/qemu: Add oss USE flag instead of always enabling
9
10 It requires no additional dependencies but some platforms like Windows
11 cannot build the OSS driver and have the oss flag masked.
12
13 Package-Manager: Portage-2.3.76, Repoman-2.3.17
14 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
15 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
16
17 app-emulation/qemu/qemu-9999.ebuild | 16 +++++++++-------
18 1 file changed, 9 insertions(+), 7 deletions(-)
19
20 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
21 index f1f1b3bc6f7..58a7d0b8580 100644
22 --- a/app-emulation/qemu/qemu-9999.ebuild
23 +++ b/app-emulation/qemu/qemu-9999.ebuild
24 @@ -35,8 +35,8 @@ SLOT="0"
25
26 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
27 +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
28 - kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
29 - pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
30 + kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
31 + +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
32 spice ssh static static-user systemtap tci test usb usbredir vde
33 +vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
34
35 @@ -475,12 +475,14 @@ qemu_src_configure() {
36
37 if [[ ! ${buildtype} == "user" ]] ; then
38 # audio options
39 - local audio_opts="oss"
40 - use alsa && audio_opts="alsa,${audio_opts}"
41 - use sdl && audio_opts="sdl,${audio_opts}"
42 - use pulseaudio && audio_opts="pa,${audio_opts}"
43 + local audio_opts=(
44 + $(usev alsa)
45 + $(usev oss)
46 + $(usev sdl)
47 + $(usex pulseaudio pa "")
48 + )
49 conf_opts+=(
50 - --audio-drv-list="${audio_opts}"
51 + --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
52 )
53 fi