| 1 |
commit: 5d79df3753917c3f2c7ef22fdb3e2d0bfb2b33f9 |
| 2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
| 3 |
AuthorDate: Mon Oct 22 13:21:08 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 22 14:38:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d79df37 |
| 7 |
|
| 8 |
app-emulation/qemu-9999: Drop sdl-1.2 support |
| 9 |
|
| 10 |
QEMU has deprecated sdl-1.2 support nearly a year ago (in |
| 11 |
upstream commit of e52c6ba3414). It's not removed yet, but it |
| 12 |
soon will be. Therefore, drop support for it in our ebuild. This |
| 13 |
is achieved by basically dropping old 'sdl' use flag and then |
| 14 |
renaming 'sdl2' to 'sdl'. |
| 15 |
|
| 16 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
| 17 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 18 |
|
| 19 |
app-emulation/qemu/qemu-9999.ebuild | 15 ++++----------- |
| 20 |
1 file changed, 4 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 23 |
index 555a20f9237..b33e04e5152 100644 |
| 24 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 25 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 26 |
@@ -30,7 +30,7 @@ SLOT="0" |
| 27 |
IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug |
| 28 |
+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux |
| 29 |
kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png |
| 30 |
- pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy |
| 31 |
+ 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" |
| 34 |
|
| 35 |
@@ -55,7 +55,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 36 |
qemu_softmmu_targets_mips64el? ( fdt ) |
| 37 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 38 |
qemu_softmmu_targets_ppc64? ( fdt ) |
| 39 |
- sdl2? ( sdl ) |
| 40 |
static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) |
| 41 |
virtfs? ( xattr ) |
| 42 |
vte? ( gtk )" |
| 43 |
@@ -127,14 +126,8 @@ SOFTMMU_TOOLS_DEPEND=" |
| 44 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
| 45 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
| 46 |
sdl? ( |
| 47 |
- !sdl2? ( |
| 48 |
- media-libs/libsdl[X] |
| 49 |
- >=media-libs/libsdl-1.2.11[static-libs(+)] |
| 50 |
- ) |
| 51 |
- sdl2? ( |
| 52 |
- media-libs/libsdl2[X] |
| 53 |
- media-libs/libsdl2[static-libs(+)] |
| 54 |
- ) |
| 55 |
+ media-libs/libsdl2[X] |
| 56 |
+ media-libs/libsdl2[static-libs(+)] |
| 57 |
) |
| 58 |
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) |
| 59 |
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) |
| 60 |
@@ -488,7 +481,7 @@ qemu_src_configure() { |
| 61 |
conf_opts+=( |
| 62 |
--audio-drv-list="${audio_opts}" |
| 63 |
) |
| 64 |
- use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
| 65 |
+ use sdl && conf_opts+=( --with-sdlabi=2.0 ) |
| 66 |
fi |
| 67 |
|
| 68 |
case ${buildtype} in |
Archives