From 34bd0869b61322dce1852d4d86057d2a8a7ef7ab Mon Sep 17 00:00:00 2001 From: Fabien Parent Date: Tue, 29 Nov 2016 15:36:58 +0100 Subject: [PATCH] xorg-server: add dependency on dri2proto when systemd is built When systemd is selected, xorg-server must have config-udev-kms enabled in order to build correctly, but it won't be the case if BR2_PACKAGE_XPROTO_DRI2PROTO is not part of the build. Add BR2_PACKAGE_XPROTO_DRI2PROTO as a dependency of xorg-xserver only when systemd is part of the build. Fixes bug #9486. Signed-off-by: Fabien Parent Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit cd4af31dd86c475482770f9ce9ccb583485c6449) --- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index df3801c5ae..9e1ee6f355 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XKEYBOARD_CONFIG + select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD help X.Org X server diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 51c3efccc8..cc886ab5e1 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -73,7 +73,9 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSERVER_XORG_SERVER_CONF_OPTS += \ --with-systemd-daemon \ --enable-systemd-logind -XSERVER_XORG_SERVER_DEPENDENCIES += systemd +XSERVER_XORG_SERVER_DEPENDENCIES += \ + systemd \ + xproto_dri2proto else XSERVER_XORG_SERVER_CONF_OPTS += \ --without-systemd-daemon \