xapp_xdpyinfo: fix dependencies

Most of the dependencies listed were optional or only indirectly needed
(E.G. the xproto ones), so don't select them.

Further more, the optional xcomposite and xinerama dependencies were missing.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in
index 261a63fe71f23660acf9a0870d20d7feb279fdc1..6584ae1711e3682112c279b8f0eb1f847d375a20 100644 (file)
--- a/package/x11r7/xapp_xdpyinfo/Config.in
+++ b/package/x11r7/xapp_xdpyinfo/Config.in
@@ -2,15 +2,6 @@ config BR2_PACKAGE_XAPP_XDPYINFO
        bool "xdpyinfo"
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXEXT
-       select BR2_PACKAGE_XLIB_LIBXI
-       select BR2_PACKAGE_XLIB_LIBXRENDER
        select BR2_PACKAGE_XLIB_LIBXTST
-       select BR2_PACKAGE_XLIB_LIBXXF86DGA
-       select BR2_PACKAGE_XLIB_LIBXXF86VM
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_KBPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
        help
          display information utility for X

diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 21439884e5958e125f98db56967c14e009078ff2..dcfe77a4d368fb707588740268e37f2ea1576026 100644 (file)
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -9,6 +9,29 @@ XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_LICENSE = MIT
 XAPP_XDPYINFO_LICENSE_FILES = COPYING
-XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
+XAPP_XDPYINFO_CONF_OPT = --without-xf86misc # not in BR
+XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXtst \
+       $(if $(BR2_PACKAGE_XLIB_LIBXI),xlib_libXi) \
+       $(if $(BR2_PACKAGE_XLIB_LIBXRENDER),xlib_libXrender) \
+       $(if $(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \
+       $(if $(BR2_PACKAGE_XLIB_LIBXXF86VM),xlib_libXxf86vm)
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86DGA),y)
+XAPP_XDPYINFO_DEPENDENCIES += xlib_libXxf86dga
+else
+XAPP_XDPYINFO_CONF_OPT += --without-dga
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
+XAPP_XDPYINFO_DEPENDENCIES += xlib_libdmx
+else
+XAPP_XDPYINFO_CONF_OPT += --without-dmx
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+XAPP_XDPYINFO_DEPENDENCIES += xlib_libXinerama
+else
+XAPP_XDPYINFO_CONF_OPT += --without-xinerama
+endif
 
 $(eval $(autotools-package))