summaryrefslogtreecommitdiffstats
path: root/package/metacity
diff options
context:
space:
mode:
Diffstat (limited to 'package/metacity')
-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