[gentoo-dev] [PATCH 0/2] app-emulation/qemu-9999: Couple of sync patches

[gentoo-dev] [PATCH 0/2] app-emulation/qemu-9999: Couple of sync patches

[Michal Privoznik]

QEMU upstream has changed a bit and thus we must update our ebuild.

Michal Privoznik (2):
  app-emulation/qemu-9999: Drop gtk2 use flag
  app-emulation/qemu-9999: Drop sdl-1.2 support

 app-emulation/qemu/qemu-9999.ebuild | 31 ++++++++---------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

-- 
2.18.1

[gentoo-dev] [PATCH 1/2] app-emulation/qemu-9999: Drop gtk2 use flag

[Michal Privoznik]

QEMU has deprecated gtk2 support nearly a year ago, and recently
it dropped the support completely (upstream commit 89d85cde75143).
Reflect this change in the live ebuild.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 app-emulation/qemu/qemu-9999.ebuild | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 833c2349a4c..555a20f9237 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug
-	+fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
+	+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
 	spice ssh static static-user systemtap tci test usb usbredir vde
@@ -50,14 +50,13 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	gtk2? ( gtk )
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
 	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy )
+	static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy )
 	virtfs? ( xattr )
 	vte? ( gtk )"
 
@@ -100,14 +99,8 @@ SOFTMMU_TOOLS_DEPEND="
 		>=net-libs/gnutls-3.0:=[static-libs(+)]
 	)
 	gtk? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.91 )
-		)
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
 	)
 	infiniband? (
 		sys-fabric/libibumad:=[static-libs(+)]
@@ -495,7 +488,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--audio-drv-list="${audio_opts}"
 		)
-		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
 		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
 	fi
 
-- 
2.18.1

[gentoo-dev] [PATCH 2/2] app-emulation/qemu-9999: Drop sdl-1.2 support

[Michal Privoznik]

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 <mprivozn@redhat.com>
---
 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

[gentoo-dev] Re: [PATCH 0/2] app-emulation/qemu-9999: Couple of sync patches

[Matthias Maier]

On Mon, Oct 22, 2018, at 08:21 CDT, Michal Privoznik <mprivozn@redhat.com> wrote:

> QEMU upstream has changed a bit and thus we must update our ebuild.
>
> Michal Privoznik (2):
>   app-emulation/qemu-9999: Drop gtk2 use flag
>   app-emulation/qemu-9999: Drop sdl-1.2 support
>
>  app-emulation/qemu/qemu-9999.ebuild | 31 ++++++++---------------------
>  1 file changed, 8 insertions(+), 23 deletions(-)

Pushed to the tree.

As always, thanks a lot for your contributions!

Matthias