From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D82EB138334 for ; Mon, 22 Oct 2018 13:22:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41BA8E0901; Mon, 22 Oct 2018 13:21:27 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E443CE08F0 for ; Mon, 22 Oct 2018 13:21:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6AB2C059B6D; Mon, 22 Oct 2018 13:21:25 +0000 (UTC) Received: from burns.redhat.com (ovpn-204-117.brq.redhat.com [10.40.204.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA3187010C; Mon, 22 Oct 2018 13:21:21 +0000 (UTC) From: Michal Privoznik To: gentoo-dev@lists.gentoo.org Cc: tamiko@gentoo.org Subject: [gentoo-dev] [PATCH 2/2] app-emulation/qemu-9999: Drop sdl-1.2 support Date: Mon, 22 Oct 2018 14:21:08 +0100 Message-Id: <83cb973d7fa12f606258106843e3e16e871c4518.1540214377.git.mprivozn@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 22 Oct 2018 13:21:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 9d11d7a2-b34d-47f5-9433-4d14a9270bd7 X-Archives-Hash: a21ad675a865556c43bfac0e72d65c2c QEMU has deprecated sdl-1.2 support nearly a year ago (in upstream commit of e52c6ba3414). It's not removed yet, but it soon will be. Therefore, drop support for it in our ebuild. This is achieved by basically dropping old 'sdl' use flag and then renaming 'sdl2' to 'sdl'. Signed-off-by: Michal Privoznik --- app-emulation/qemu/qemu-9999.ebuild | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 555a20f9237..b33e04e5152 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -30,7 +30,7 @@ SLOT="0" IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy + pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" @@ -55,7 +55,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -127,14 +126,8 @@ SOFTMMU_TOOLS_DEPEND=" rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) + media-libs/libsdl2[X] + media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) @@ -488,7 +481,7 @@ qemu_src_configure() { conf_opts+=( --audio-drv-list="${audio_opts}" ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) + use sdl && conf_opts+=( --with-sdlabi=2.0 ) fi case ${buildtype} in -- 2.18.1