summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:34 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2013-01-12 22:50:05 +0100
commitbfee0ba5dde011f44bcca9e08d35e244e35d0fe4 (patch)
tree13c612559cf38f892c1e31d4b061c9fe01c14994
parent3ba6d3815d51405454d475fbe1400ee93609a152 (diff)
downloadbuildroot-novena-bfee0ba5dde011f44bcca9e08d35e244e35d0fe4.tar.gz
buildroot-novena-bfee0ba5dde011f44bcca9e08d35e244e35d0fe4.zip
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>
-rw-r--r--package/metacity/Config.in10
-rw-r--r--package/metacity/metacity.mk12
2 files changed, 21 insertions, 1 deletions
diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index c483c44e2..833a091e7 100644
--- 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 990ec9fae..aa78a7a57 100644
--- 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