libsdl2: add back xvm and xinerama options

When building libsdl2-native, and I met a do_configure error as below.

  | CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
  | Please set them or make sure they are set and tested correctly in the CMake files:
  | XINERAMA_LIB

This error appears on hosts with libxinerama-dev installed.

Looking at the CMakeLists.txt file, I got:

  set(SDL_X11_OPTIONS Xcursor Xdbe Xinerama XInput Xfixes Xrandr Xscrnsaver XShape Xvm

We an see neither Xinerama nor Xvm is removed. So we should add back
these options removed by a previous commit.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb
index b112d63784f13a83b19e48ac797b2e8dce733dd4..8519e7f7328cee1cc0a56dd69c26e85d3c8be70a 100644 (file)
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.22.bb
@@ -43,7 +43,9 @@ 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 \