Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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>
  • Loading branch information...
commit bfee0ba5dde011f44bcca9e08d35e244e35d0fe4 1 parent 3ba6d38
Thomas Petazzoni authored Peter Korsgaard committed
10  package/metacity/Config.in
@@ -2,5 +2,15 @@ config BR2_PACKAGE_METACITY
2 2
 	bool "metacity"
3 3
 	depends on BR2_PACKAGE_LIBGTK2
4 4
 	depends on BR2_PACKAGE_XORG7
  5
+	select BR2_PACKAGE_XLIB_LIBX11
  6
+	# Metacity configure.ac pretends it can be built without
  7
+	# Composite, but in reality, it doesn't build.
  8
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
  9
+	select BR2_PACKAGE_XLIB_LIBXFIXES
  10
+	select BR2_PACKAGE_XLIB_LIBXRENDER
  11
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE
  12
+	# We do not directly depend on Xft, but they are needed to get
  13
+	# Xft support in Pango, which we require.
  14
+	select BR2_PACKAGE_XLIB_LIBXFT
5 15
 	help
6 16
 	  Metacity is a window manager for the X Window System.
12  package/metacity/metacity.mk
@@ -17,7 +17,17 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
17 17
 		--disable-dependency-tracking \
18 18
 		--disable-sm --disable-startup-notification
19 19
 
20  
-METACITY_DEPENDENCIES = libgtk2 xserver_xorg-server
  20
+METACITY_DEPENDENCIES = libgtk2 \
  21
+	xlib_libX11 \
  22
+	host-libxml-parser-perl \
  23
+	xlib_libXcomposite \
  24
+	xlib_libXfixes \
  25
+	xlib_libXrender \
  26
+	xlib_libXdamage
  27
+
  28
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
  29
+METACITY_DEPENDENCIES += xlib_libXcursor
  30
+endif
21 31
 
22 32
 define METACITY_INSTALL_XSESSION
23 33
 	install -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession

0 notes on commit bfee0ba

Please sign in to comment.
Something went wrong with that request. Please try again.