diff mbox series

[meta-oe] libsdl3: add fallback to console-build

Message ID 20250317125601.1354282-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe] libsdl3: add fallback to console-build | expand

Commit Message

Markus Volk March 17, 2025, 12:56 p.m. UTC
This fixes a configure error if neither wayland nor x11 are available:

| CMake Error at cmake/macros.cmake:382 (message):
|   SDL could not find X11 or Wayland development libraries on your system.
|   This means SDL will not be able to create windows on a typical unix
|   operating system.  Most likely, this is not wanted.
|
|   On Linux, install the packages listed at
|   https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
|
|
|   If you really don't need desktop windows, the documentation tells you how
|   to skip this check.
|   https://github.com/libsdl-org/SDL/blob/main/docs/README-cmake.md#cmake-fails-to-build-without-x11-or-wayland-supp

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb | 2 ++
 1 file changed, 2 insertions(+)

Comments

Martin Jansa March 17, 2025, 3:39 p.m. UTC | #1
Acked-by: Martin Jansa <martin.jansa@gmail.com>

On Mon, Mar 17, 2025 at 1:55 PM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> This fixes a configure error if neither wayland nor x11 are available:
>
> | CMake Error at cmake/macros.cmake:382 (message):
> |   SDL could not find X11 or Wayland development libraries on your system.
> |   This means SDL will not be able to create windows on a typical unix
> |   operating system.  Most likely, this is not wanted.
> |
> |   On Linux, install the packages listed at
> |   https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
> |
> |
> |   If you really don't need desktop windows, the documentation tells you how
> |   to skip this check.
> |   https://github.com/libsdl-org/SDL/blob/main/docs/README-cmake.md#cmake-fails-to-build-without-x11-or-wayland-supp
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
> index 63a78907b0..86a0ae6b50 100644
> --- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
> +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
> @@ -55,9 +55,11 @@ PACKAGECONFIG ??= " \
>         ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio pipewire x11 vulkan', d)} \
>         ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \
>         ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
> +       ${@bb.utils.contains_any("DISTRO_FEATURES", "x11 wayland","","console-build",d)} \
>  "
>  PACKAGECONFIG[alsa]       = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
>  PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
> +PACKAGECONFIG[console-build] = "-DSDL_UNIX_CONSOLE_BUILD=ON"
>  PACKAGECONFIG[gles2]      = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
>  PACKAGECONFIG[jack]       = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
>  PACKAGECONFIG[kmsdrm]     = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm"
> --
> 2.48.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116025): https://lists.openembedded.org/g/openembedded-devel/message/116025
> Mute This Topic: https://lists.openembedded.org/mt/111748463/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
index 63a78907b0..86a0ae6b50 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.8.bb
@@ -55,9 +55,11 @@  PACKAGECONFIG ??= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio pipewire x11 vulkan', d)} \
 	${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \
 	${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
+	${@bb.utils.contains_any("DISTRO_FEATURES", "x11 wayland","","console-build",d)} \
 "
 PACKAGECONFIG[alsa]       = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
 PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
+PACKAGECONFIG[console-build] = "-DSDL_UNIX_CONSOLE_BUILD=ON"
 PACKAGECONFIG[gles2]      = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
 PACKAGECONFIG[jack]       = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
 PACKAGECONFIG[kmsdrm]     = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm"