From f66236e0a9e18045cb1566bc368368de5a5cc499 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 23 Jul 2012 11:49:19 +0200 Subject: [PATCH] mediastreamer: fix build with libX11 and sdl without x11 support Fixes http://autobuild.buildroot.net/results/a8f2db4a40c0f53c0d25b2632fe87c2ce136f770 Mediastreamer assumes SDL has X11 support if SDL and libX11 are found, which is not necessarily true in BR. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/mediastreamer/mediastreamer.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 9e67ed49d3..1f4e1d4eeb 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -48,9 +48,10 @@ else MEDIASTREAMER_CONF_OPT += --disable-sdl endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support +# is only used for SDL output) +ifeq ($(BR2_PACKAGE_SDL_X11),y) MEDIASTREAMER_CONF_OPT += --enable-x11 -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 else MEDIASTREAMER_CONF_OPT += --disable-x11 endif -- 2.30.2