[Buildroot] [PATCH v2 1/1] package/x11r7/xserver_xorg-server: needs dri/dri2/dri3 for libdrm support

* [Buildroot] [PATCH v2 1/1] package/x11r7/xserver_xorg-server: needs dri/dri2/dri3 for libdrm support
@ 2016-08-07 16:04 Bernd Kuhls
  2016-08-10 22:05 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2016-08-07 16:04 UTC (permalink / raw)
  To: buildroot

Rework dependency handling as pointed out by Thomas:
http://lists.busybox.net/pipermail/buildroot/2016-July/168433.html

Fixes
http://autobuild.buildroot.net/results/2d3/2d38637e7904f3e382e41745a82ee1a1cf19ba71/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: simplified udev kms check (Peter)

 package/x11r7/xserver_xorg-server/Config.in              | 11 +++++++++--
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index df3801c..5715a56 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -55,6 +55,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 
 if BR2_PACKAGE_XSERVER_XORG_SERVER
 
+config BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM
+	bool
+	select BR2_PACKAGE_LIBDRM
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
 	bool
 
@@ -103,10 +107,13 @@ choice
 config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	bool "Modular X.org"
 	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
-		BR2_PACKAGE_XPROTO_DRI2PROTO)
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM if \
+		(BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
+		BR2_PACKAGE_XPROTO_DRI2PROTO || \
+		BR2_PACKAGE_XPROTO_DRI3PROTO)
 	select BR2_PACKAGE_LIBPCIACCESS
 	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
+
 	help
 	  This variant of the X.org server is the full-blown variant,
 	  as used by desktop GNU/Linux distributions. The drivers (for
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 85d7e98..751be94 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -97,7 +97,7 @@ endif
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
 XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
-ifeq ($(BR2_PACKAGE_LIBDRM),y)
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm
 else
@@ -163,8 +163,8 @@ endif
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += udev
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
-# udev kms support depends on libdrm and dri2
-ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)
+# udev kms support depends on dri2
+ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread