[Buildroot] [git commit] metacity: fix X.org dependencies
Peter Korsgaard
jacmet at sunsite.dk
Sat Jan 12 21:50:05 UTC 2013
commit: http://git.buildroot.net/buildroot/commit/?id=bfee0ba5dde011f44bcca9e08d35e244e35d0fe4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
---
package/metacity/Config.in | 10 ++++++++++
package/metacity/metacity.mk | 12 +++++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index c483c44..833a091 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 990ec9f..aa78a7a 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
More information about the buildroot
mailing list