From 09092685fdc8ffe6384bea441394ce02d6ff7e66 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 21 May 2022 10:48:50 +0200 Subject: libsdl2: add PACKAGECONFIG for libusb1 and remove obsolete options Support for XVM and Xinerama has been removed Signed-off-by: Markus Volk Signed-off-by: Richard Purdie --- meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb index 7678319770..b112d63784 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb @@ -43,9 +43,7 @@ EXTRA_OECMAKE = "-DSDL_OSS=OFF -DSDL_ESD=OFF -DSDL_ARTS=OFF \ -DSDL_PTHREADS=ON \ -DSDL_RPATH=OFF \ -DSDL_SNDIO=OFF \ - -DSDL_X11_XVM=OFF \ -DSDL_X11_XCURSOR=OFF \ - -DSDL_X11_XINERAMA=OFF \ -DSDL_X11_XDBE=OFF \ -DSDL_X11_XFIXES=OFF \ -DSDL_X11_XINPUT=OFF \ @@ -72,6 +70,9 @@ PACKAGECONFIG[directfb] = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,direc 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" +# The hidraw support doesn't catch Xbox, PS4 and Nintendo controllers, +# so we'll just use libusb when it's available. +PACKAGECONFIG[libusb] = ",,libusb1" PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl" PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[wayland] = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon" -- cgit 1.2.3-korg