From 739b66e8d9c5c1e228486c8b4ed2be2fb1e8559d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 26 Feb 2017 17:48:53 +0100 Subject: [PATCH] package/sdl2: enable opengl support OpenGl support mean GLX so it require X11 support. Select automatically BR2_PACKAGE_SDL2_X11 to enable minimal X11 libraries support (libx11 and libxext). Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sdl2/Config.in | 11 +++++++++++ package/sdl2/sdl2.mk | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 8fc14ee737..6345133c42 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -29,6 +29,17 @@ comment "X11 video driver needs X.org" depends on !BR2_PACKAGE_XORG7 depends on BR2_USE_MMU +config BR2_PACKAGE_SDL2_OPENGL + bool "OpenGL (GLX)" + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # X11 video driver + select BR2_PACKAGE_SDL2_X11 + +comment "OpenGL support needs X11 and an OpenGL provider" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 + endif comment "sdl2 needs a toolchain w/ dynamic library" diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 2ec12e639e..3f210f8d60 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -18,7 +18,6 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-opengl \ --disable-video-opengles \ --disable-video-wayland @@ -99,6 +98,13 @@ else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif +ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y) +SDL2_CONF_OPTS += --enable-video-opengl +SDL2_DEPENDENCIES += libgl +else +SDL2_CONF_OPTS += --disable-video-opengl +endif + ifeq ($(BR2_PACKAGE_TSLIB),y) SDL2_DEPENDENCIES += tslib SDL2_CONF_OPTS += --enable-input-tslib -- 2.30.2