diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-01 20:12:47 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-01 20:12:47 +0200 |
| commit | 32154996a8bd13d64b410ee519121614f6c7ecd0 (patch) | |
| tree | a852f77b4cbdca309472407e23623e506d6c25b0 | |
| parent | 0468be6e07185a57a8d01c57bfefcc2487a16875 (diff) | |
| parent | 51ef5b81224c243aa7f937c4690b1a120c81ccbc (diff) | |
Merge branch 'matchbox-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot
| -rw-r--r-- | package/matchbox/Config.in | 1 | ||||
| -rw-r--r-- | package/matchbox/matchbox.mk | 7 | ||||
| -rw-r--r-- | package/x11r7/xlib_libXfont/xlib_libXfont.mk | 2 | ||||
| -rw-r--r-- | package/x11r7/xlib_libXft/xlib_libXft.mk | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index a5e68f8c9..b57a4a29f 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MATCHBOX bool "MatchBox Window Manager" select BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XORG7 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 6dfccf853..a3ff222f6 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -160,6 +160,8 @@ MATCHBOX_WM_OPTS:= MATCHBOX_WM_DEPS:=xlib_libXdamage MATCHBOX_WM_DEPS+=xlib_libXcursor +MATCHBOX_KB_DEPS:= + ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) MATCHBOX_WM_OPTS+=--enable-composite @@ -199,8 +201,10 @@ endif ifeq ($(BR2_PACKAGE_PANGO),y) MATCHBOX_LIB_OPTS+=--enable-pango MATCHBOX_LIB_DEPS+=pango + MATCHBOX_KB_OPTS+=--enable-pango else MATCHBOX_LIB_OPTS+=--disable-pango + MATCHBOX_KB_DEPS+=xlib_libXft endif ifeq ($(BR2_PACKAGE_X11R7_LIBXFT2),y) @@ -424,6 +428,7 @@ $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ + $(MATCHBOX_KB_OPTS) \ ) touch $(MATCHBOX_KB_DIR)/.configured @@ -610,7 +615,7 @@ matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGE matchbox-desktop: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_DP_BIN) -matchbox-keyboard: uclibc matchbox xlib_libXtst $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) +matchbox-keyboard: uclibc matchbox xlib_libXtst $(MATCHBOX_KB_DEPS) $(TARGET_DIR)/usr/lib/$(MATCHBOX_FK_BIN).so $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN) matchbox-clean: rm -f $(TARGET_DIR)/usr/lib/libmb.* diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 39b25fc81..a64b74ef2 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -7,7 +7,7 @@ XLIB_LIBXFONT_VERSION = 1.3.3 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFONT_AUTORECONF = NO +XLIB_LIBXFONT_AUTORECONF = YES XLIB_LIBXFONT_INSTALL_STAGING = YES XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index b112d235e..5ae3f1701 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -7,7 +7,7 @@ XLIB_LIBXFT_VERSION = 2.1.13 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFT_AUTORECONF = NO +XLIB_LIBXFT_AUTORECONF = YES XLIB_LIBXFT_INSTALL_STAGING = YES XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static |