metacity: fix X.org dependencies

Metacity is a X client application, so there is no reason to depend on
the X.org server. Instead, depend on the appropriate X libraries.

In addition to the X.org related dependencies, we also add the
host-libxml-parser-perl dependency, otherwise:

  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
  make[1]: *** [/home/test/outputs/xorg/build/metacity-2.25.1/.stamp_configured] Error 1
  make: *** [all] Error 2

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index c483c44e24b9a3f469ca577ff9ba7a0c06ff3731..833a091e7fd3916438ca90f667180341e343d2db 100644 (file)
--- a/package/metacity/Config.in
+++ b/package/metacity/Config.in
@@ -2,5 +2,15 @@ config BR2_PACKAGE_METACITY
        bool "metacity"
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_XLIB_LIBX11
+       # Metacity configure.ac pretends it can be built without
+       # Composite, but in reality, it doesn't build.
+       select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
+       select BR2_PACKAGE_XLIB_LIBXFIXES
+       select BR2_PACKAGE_XLIB_LIBXRENDER
+       select BR2_PACKAGE_XLIB_LIBXDAMAGE
+       # We do not directly depend on Xft, but they are needed to get
+       # Xft support in Pango, which we require.
+       select BR2_PACKAGE_XLIB_LIBXFT
        help
          Metacity is a window manager for the X Window System.

diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index 990ec9faec6c47626eef1a546fe969e715edf827..aa78a7a574eb50fe4ce15134bb91d5fb7344ebd8 100644 (file)
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -17,7 +17,17 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
                --disable-dependency-tracking \
                --disable-sm --disable-startup-notification
 
-METACITY_DEPENDENCIES = libgtk2 xserver_xorg-server
+METACITY_DEPENDENCIES = libgtk2 \
+       xlib_libX11 \
+       host-libxml-parser-perl \
+       xlib_libXcomposite \
+       xlib_libXfixes \
+       xlib_libXrender \
+       xlib_libXdamage
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+METACITY_DEPENDENCIES += xlib_libXcursor
+endif
 
 define METACITY_INSTALL_XSESSION
        install -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession