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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 595C7158016 for ; Tue, 26 Dec 2023 21:26:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A48B2BC017; Tue, 26 Dec 2023 21:26:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F5BD2BC017 for ; Tue, 26 Dec 2023 21:26:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3641A3406C2 for ; Tue, 26 Dec 2023 21:26:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD0B0ED2 for ; Tue, 26 Dec 2023 21:26:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1703625852.287b32c46ef4a274fe2ae132f5de1af413ffc84a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-2.12-r1.ebuild sys-boot/grub/grub-2.12.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 287b32c46ef4a274fe2ae132f5de1af413ffc84a X-VCS-Branch: master Date: Tue, 26 Dec 2023 21:26:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01e35303-2123-4b47-ab70-8d89f4a54901 X-Archives-Hash: c42e782a58bc076f99ffba966c08b381 commit: 287b32c46ef4a274fe2ae132f5de1af413ffc84a Author: Zac Medico gentoo org> AuthorDate: Mon Dec 25 20:55:09 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 26 21:24:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287b32c4 sys-boot/grub: Use libsdl2 instead of libsdl Solves this configure error with sdl enabled: checking for SDL2... yes configure: error: SDL support for grub-emu was explicitly requested but can't be compiled (disabled by sdl2) Also fix the fuse dependency to use fuse:3. Bug: https://bugs.gentoo.org/880377 Bug: https://bugs.gentoo.org/920699 Signed-off-by: Zac Medico gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/34475 Signed-off-by: Sam James gentoo.org> sys-boot/grub/{grub-2.12.ebuild => grub-2.12-r1.ebuild} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild similarity index 98% rename from sys-boot/grub/grub-2.12.ebuild rename to sys-boot/grub/grub-2.12-r1.ebuild index af2c3e716ed0..80061b9e8e2a 100644 --- a/sys-boot/grub/grub-2.12.ebuild +++ b/sys-boot/grub/grub-2.12-r1.ebuild @@ -120,11 +120,11 @@ DEPEND=" app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) - mount? ( sys-fs/fuse:0 ) + mount? ( sys-fs/fuse:3 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) @@ -231,7 +231,8 @@ grub_configure() { $(use_enable themes grub-themes) $(use_enable truetype grub-mkfont) $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) + --enable-grub-emu-sdl=no + $(use_enable sdl grub-emu-sdl2) ${platform:+--with-platform=}${platform} # Let configure detect this where supported