From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBKfU-0001lR-2V for guix-patches@gnu.org; Wed, 25 Apr 2018 09:41:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBKfP-00036o-FT for guix-patches@gnu.org; Wed, 25 Apr 2018 09:41:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBKfP-00036D-8p for guix-patches@gnu.org; Wed, 25 Apr 2018 09:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fBKfN-0004Mg-RZ for guix-patches@gnu.org; Wed, 25 Apr 2018 09:41:02 -0400 Subject: [bug#31254] gnu: qemu: Build with Python 3 and SDL 2. (+ GTK 3 frontend) v2 Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180425152642.2a361ae5@mykolab.com> References: <20180425083346.29a434e9@mykolab.com> <87lgdb8rf2.fsf@fastmail.com> <20180425152642.2a361ae5@mykolab.com> Date: Wed, 25 Apr 2018 15:40:34 +0200 Message-ID: <87in8f8kvh.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Rutger Helling Cc: 31254@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Rutger Helling writes: > Hello Marius,=20 > > Thanks for the review! I've taken your suggestions into account and > updated the patches. > > I don't think it's possible to seperate the GTK3 frontend, since it's > just a parameter you pass to the qemu* binaries (-display gtk instead > of -display sdl). > > From my understanding if you have both GTK3 and SDL2 enabled it > defaults to GTK3. We can remove the SDL2 frontend if there are no > objections (and probably sdl from the --audio-drv-list). I just figured > it'd be nicer to enable both to give users maximum flexibility. OK! [...] > From e1b40133c8aedf84090fbd4292af2b53eb22d669 Mon Sep 17 00:00:00 2001 > From: Rutger Helling > Date: Wed, 25 Apr 2018 14:59:11 +0200 > Subject: [PATCH 1/2] gnu: qemu: Build with Python 3 and SDL2 support. > > * gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable. > * gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl. > [native-inputs]: Use python instead of python@2. Add python-wrapper. > * gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 ins= tead of > sdl from inherited packages. > * gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable. > [native-inputs]: Remove python from inherited packages and use python@2 i= nstead. > --- > gnu/packages/bootloaders.scm | 16 ---------------- > gnu/packages/virtualization.scm | 30 ++++++++++++++++++++++++++---- > 2 files changed, 26 insertions(+), 20 deletions(-) Can you adjust 'american-fuzzy-lop' to use the moved qemu-minimal-2.10 package too? Please also drop the '@@ (gnu packages bootloaders)' stuff and just use '(inherit qemu-minimal-2.10 ...)' now that it's public. [...] > @@ -187,7 +187,7 @@ exec smbd $@"))) > ;; ("pciutils" ,pciutils) > ("pixman" ,pixman) > ("pulseaudio" ,pulseaudio) > - ("sdl" ,sdl) > + ("sdl2" ,sdl2) > ("spice" ,spice) > ("usbredir" ,usbredir) > ("util-linux" ,util-linux) > @@ -197,7 +197,8 @@ exec smbd $@"))) > (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc. > ("perl" ,perl) > ("pkg-config" ,pkg-config) > - ("python" ,python-2) ; incompatible with Python 3 a= ccording to error message > + ("python" ,python) > + ("python-wrapper" ,python-wrapper) The first "python" can be removed (only python-wrapper is necessary). > ("texinfo" ,texinfo))) > (home-page "https://www.qemu.org") > (synopsis "Machine emulator and virtualizer") > @@ -233,9 +234,30 @@ server and embedded PowerPC, and S390 guests.") >=20=20 > ;; Remove dependencies on optional libraries, notably GUI libraries. > (inputs (fold alist-delete (package-inputs qemu) > - '("libusb" "mesa" "sdl" "spice" "virglrenderer" > + '("libusb" "mesa" "sdl2" "spice" "virglrenderer" > "usbredir" "libdrm" "libepoxy" "pulseaudio"))))) >=20=20 > +;; The GRUB test suite fails with later versions of Qemu, so we > +;; keep it at 2.10 for now. See > +;; . > +;; TODO: When grub no longer needs this version, move to gnu/packages/de= bug.scm. The TODO line can be removed too. And maybe add a comment such as "Keep it hidden since we don't backport security patches" or something along those lines. [...] > From edea64c09dc1e0f391e860478dcf99f4d0d1a6d2 Mon Sep 17 00:00:00 2001 > From: Rutger Helling > Date: Wed, 25 Apr 2018 15:03:29 +0200 > Subject: [PATCH 2/2] gnu: qemu: Enable GTK3 frontend. > > * gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to= native-inputs. > [inputs]: Add "gtk+" to inputs. > * gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "= gettext" > from inherited inputs. > [inputs]: Remove "gtk+" from inherited inputs. LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlrghVMACgkQoqBt8qM6 VPrMlAf/QmkyG50dn+jW6NA9vnVXG1HjumWJrTxd2mjQiYzOrMtIjDOkdu8aGlQC w4WS+z4+WWjB19MtLr95Vm6RKPtAw4ynS7CqKkn+giq+ylz0RMA2QiztGUC/NIP0 uyTb9bP4bkve516x5CiTwj+Bk80btCU62JPRb865Q3VkTgkCNiFDjRneBnHctyLu l4VYY23ZqAPYhsd1fBkyg3cIr/hPzPrZBfYu0u7T9NAdlcJFJTYdkifaMMw+Qtr3 Rdaxsc7mcWqljaTCOrYqLvLkLWhNaEcDlOBCMyOixeSIBTt4GsEtlNt6yiKNQ6RI oNho0kyLWHCY51swPL5Ax5+wP0ZV1g== =YbTr -----END PGP SIGNATURE----- --=-=-=--