From 82575b3e52b5ada683a3305a275ed38cdda3a912 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 May 2025 17:58:24 +0200 Subject: [PATCH] package/sdl2: allow wayland support to be enabled without X11 Commit 4662553088 ("package/sdl2: add wayland support") added an option to enable wayland support but accidentally put the .mk logic inside the BR2_PACKAGE_SDL2_X11, so it would only trigger if the X11 driver was enabled. Fix that by moving it outside the conditional. Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 9b4a19571c..5ed7c6c612 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -104,13 +104,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-xcursor endif -ifeq ($(BR2_PACKAGE_SDL2_WAYLAND),y) -SDL2_DEPENDENCIES += libegl libxkbcommon wayland wayland-protocols -SDL2_CONF_OPTS += --enable-video-wayland -else -SDL2_CONF_OPTS += --disable-video-wayland -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) SDL2_DEPENDENCIES += xlib_libXi SDL2_CONF_OPTS += --enable-video-x11-xinput @@ -136,6 +129,13 @@ else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif +ifeq ($(BR2_PACKAGE_SDL2_WAYLAND),y) +SDL2_DEPENDENCIES += libegl libxkbcommon wayland wayland-protocols +SDL2_CONF_OPTS += --enable-video-wayland +else +SDL2_CONF_OPTS += --disable-video-wayland +endif + ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y) SDL2_CONF_OPTS += --enable-video-opengl SDL2_DEPENDENCIES += libgl