summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-07-23 09:49:19 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-07-24 07:26:42 (GMT)
commitf66236e0a9e18045cb1566bc368368de5a5cc499 (patch)
tree03aa19f37dae597501ed5156f937bec61eaa9248
parent8e26abecd00f4899fb122c3eeb03fbdf20cda32e (diff)
downloadbuildroot-f66236e0a9e18045cb1566bc368368de5a5cc499.tar.gz
buildroot-f66236e0a9e18045cb1566bc368368de5a5cc499.tar.bz2
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 <jacmet@sunsite.dk> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mediastreamer/mediastreamer.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index 9e67ed4..1f4e1d4 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