Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Tue, 25 Aug 2020 22:24:00
Message-Id: 1598394230.e11a90081df511b04e286caad67d18d6fc45d664.slyfox@gentoo
1 commit: e11a90081df511b04e286caad67d18d6fc45d664
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 25 20:18:54 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 25 22:23:50 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11a9008
7
8 app-emulation/qemu: add jack support
9
10 Closes: https://bugs.gentoo.org/733612
11 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 app-emulation/qemu/qemu-5.1.0.ebuild | 6 ++++--
15 app-emulation/qemu/qemu-9999.ebuild | 6 ++++--
16 2 files changed, 8 insertions(+), 4 deletions(-)
17
18 diff --git a/app-emulation/qemu/qemu-5.1.0.ebuild b/app-emulation/qemu/qemu-5.1.0.ebuild
19 index dc2c1447afa..b61be88f117 100644
20 --- a/app-emulation/qemu/qemu-5.1.0.ebuild
21 +++ b/app-emulation/qemu/qemu-5.1.0.ebuild
22 @@ -34,7 +34,7 @@ SLOT="0"
23
24 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
25 +fdt glusterfs gnutls gtk infiniband iscsi io-uring
26 - jemalloc +jpeg kernel_linux
27 + jack jemalloc +jpeg kernel_linux
28 kernel_FreeBSD lzo multipath
29 ncurses nfs nls numa opengl +oss +pin-upstream-blobs
30 plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
31 @@ -67,7 +67,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
32 qemu_softmmu_targets_ppc? ( fdt )
33 qemu_softmmu_targets_riscv32? ( fdt )
34 qemu_softmmu_targets_riscv64? ( fdt )
35 - static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
36 + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
37 static-user? ( !plugins )
38 virtfs? ( caps xattr )
39 vte? ( gtk )
40 @@ -122,6 +122,7 @@ SOFTMMU_TOOLS_DEPEND="
41 )
42 iscsi? ( net-libs/libiscsi )
43 io-uring? ( sys-libs/liburing[static-libs(+)] )
44 + jack? ( virtual/jack )
45 jemalloc? ( dev-libs/jemalloc )
46 jpeg? ( virtual/jpeg:0=[static-libs(+)] )
47 lzo? ( dev-libs/lzo:2[static-libs(+)] )
48 @@ -507,6 +508,7 @@ qemu_src_configure() {
49 # Note: backend order matters here: #716202
50 # We iterate from higher-level to lower level.
51 $(usex pulseaudio pa "")
52 + $(usev jack)
53 $(usev sdl)
54 $(usev alsa)
55 $(usev oss)
56
57 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
58 index dc2c1447afa..b61be88f117 100644
59 --- a/app-emulation/qemu/qemu-9999.ebuild
60 +++ b/app-emulation/qemu/qemu-9999.ebuild
61 @@ -34,7 +34,7 @@ SLOT="0"
62
63 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
64 +fdt glusterfs gnutls gtk infiniband iscsi io-uring
65 - jemalloc +jpeg kernel_linux
66 + jack jemalloc +jpeg kernel_linux
67 kernel_FreeBSD lzo multipath
68 ncurses nfs nls numa opengl +oss +pin-upstream-blobs
69 plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
70 @@ -67,7 +67,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
71 qemu_softmmu_targets_ppc? ( fdt )
72 qemu_softmmu_targets_riscv32? ( fdt )
73 qemu_softmmu_targets_riscv64? ( fdt )
74 - static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
75 + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
76 static-user? ( !plugins )
77 virtfs? ( caps xattr )
78 vte? ( gtk )
79 @@ -122,6 +122,7 @@ SOFTMMU_TOOLS_DEPEND="
80 )
81 iscsi? ( net-libs/libiscsi )
82 io-uring? ( sys-libs/liburing[static-libs(+)] )
83 + jack? ( virtual/jack )
84 jemalloc? ( dev-libs/jemalloc )
85 jpeg? ( virtual/jpeg:0=[static-libs(+)] )
86 lzo? ( dev-libs/lzo:2[static-libs(+)] )
87 @@ -507,6 +508,7 @@ qemu_src_configure() {
88 # Note: backend order matters here: #716202
89 # We iterate from higher-level to lower level.
90 $(usex pulseaudio pa "")
91 + $(usev jack)
92 $(usev sdl)
93 $(usev alsa)
94 $(usev oss)