summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2016-04-28 08:20:45 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-28 13:34:39 +0200
commita451a9480563d01dcfa51c2ed4020414f3c6426f (patch)
treec6eea0dadc8dcd5ed6804acb9a649cadde4cbd63
parent28967c847e34edde6e77ea69fd0e654118379e2b (diff)
downloadbuildroot-a451a9480563d01dcfa51c2ed4020414f3c6426f.tar.gz
buildroot-a451a9480563d01dcfa51c2ed4020414f3c6426f.zip
mpv: fix wayland deps
The wayland backend requires libxkbcommon, so when wayland is available select it to avoid build failure and obscure dependencies. Fixes: http://autobuild.buildroot.net/results/ed2/ed2660361c9720e48dd5959f2711fd7f14031b0d/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mpv/Config.in2
-rw-r--r--package/mpv/mpv.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 0f5aa970f2..36617e56f9 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_MPV
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_ZLIB
+ # Select xkbcommon for wayland to avoid being misterious
+ select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
help
mpv is a fork of mplayer2 and MPlayer. It shares some features
with the former projects while introducing many more.
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 0032eb5857..605e8912ff 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -187,7 +187,7 @@ endif
# wayland support
ifeq ($(BR2_PACKAGE_WAYLAND),y)
MPV_CONF_OPTS += --enable-wayland
-MPV_DEPENDENCIES += wayland
+MPV_DEPENDENCIES += libxkbcommon wayland
else
MPV_CONF_OPTS += --disable-wayland
endif
OpenPOWER on IntegriCloud