Commit f94830d0 authored by Will Wagner's avatar Will Wagner Committed by Peter Korsgaard
Browse files

matchbox: convert to autotools, fix build with start-notification, libxft 



Signed-off-by: default avatarWill Wagner <will_wagner@carallon.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent cb08cd64

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


	Updated/fixed packages: busybox, dnsmasq, dosfstools,

	e2fsprogs, freetype, iperf, iptables, iw, less, libdrm,

	libgcrypt, libglib2, libpng, libxml2, mdadm, memstat,

	libgcrypt, libglib2, libpng, libxml2, matchbox, mdadm, memstat,

	mtd-utils, nano, openssl, php, pppd, qt, radvd, setserial,

	squashfs, wget, xlib_libX11, xlib_libXfont

package/matchbox/Config.in

+2 −9
Original line number Diff line number Diff line
@@ -2,20 +2,13 @@ config BR2_PACKAGE_MATCHBOX 
	bool "MatchBox Window Manager"

	depends on BR2_PACKAGE_XORG7

	select BR2_PACKAGE_FONTCONFIG

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_XLIB_LIBXEXT

	select BR2_PACKAGE_XLIB_LIBXDAMAGE

	select BR2_PACKAGE_XLIB_LIBXCURSOR

	help

	  http://projects.o-hand.com/matchbox



config BR2_PACKAGE_MATCHBOX_SNOTIFY

	bool "Enable Matchbox Startup Notification"

	depends on BR2_PACKAGE_MATCHBOX

	select BR2_PACKAGE_XAPP_XSM

	help

	  Compiles

	  http://www.freedesktop.org/Software/startup-notification and

	  its support in MatchBox.



config BR2_PACKAGE_MATCHBOX_PANEL

	bool "Matchbox Panel"

	depends on BR2_PACKAGE_MATCHBOX

package/matchbox/matchbox-common/matchbox-common.mk

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#############################################################

#

# MatchBox Common

#

#############################################################



MATCHBOX_COMMON_VERSION = 0.9.1

MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2

MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)

MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib



#############################################################



$(eval $(call AUTOTARGETS,package/matchbox,matchbox-common))

package/matchbox/matchbox-desktop/matchbox-desktop.mk

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#############################################################

#

# MatchBox Desktop

#

#############################################################



MATCHBOX_DESKTOP_VERSION = 0.9.1

MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2

MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)

MATCHBOX_DESKTOP_LIBTOOL_PATCH = NO

MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib

MATCHBOX_DESKTOP_CONF_OPT = --enable-expat



define MATCHBOX_DESKTOP_POST_INSTALL_FIXES

 cp -f ./package/matchbox/matchbox-desktop/mbdesktop_modules $(TARGET_DIR)/etc/matchbox/

endef



MATCHBOX_DESKTOP_POST_INSTALL_TARGET_HOOKS += MATCHBOX_DESKTOP_POST_INSTALL_FIXES



#############################################################



ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)

  MATCHBOX_DESKTOP_CONF_OPT+=--enable-startup-notification

  MATCHBOX_DESKTOP_DEPENDENCIES+=startup-notification

else

  MATCHBOX_DESKTOP_CONF_OPT+=--disable-startup-notification

endif



#############################################################



$(eval $(call AUTOTARGETS,package/matchbox,matchbox-desktop))