summaryrefslogtreecommitdiff
path: root/package/matchbox/matchbox-lib
diff options
context:
space:
mode:
authorWill Wagner <will_wagner@carallon.com>2010-04-01 11:10:12 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-04-03 13:45:23 +0200
commitf94830d0e5a409b2e2dc30a4e002c180fe09ec4e (patch)
treeacf0f7e9f84d00bba862f0d36cf6fa1f2a2f9e2a /package/matchbox/matchbox-lib
parentcb08cd64f0fe89d9551052cafeae96045441df51 (diff)
matchbox: convert to autotools, fix build with start-notification, libxft
Signed-off-by: Will Wagner <will_wagner@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/matchbox/matchbox-lib')
-rw-r--r--package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch35
-rw-r--r--package/matchbox/matchbox-lib/matchbox-lib.mk58
2 files changed, 93 insertions, 0 deletions
diff --git a/package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch b/package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch
new file mode 100644
index 000000000..b486fb18d
--- /dev/null
+++ b/package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch
@@ -0,0 +1,35 @@
+index() is a legacy function, not implemented in some uClibc
+configurations.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libmb/mbexp.c | 2 +-
+ libmb/mbmenu.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: libmatchbox-1.9/libmb/mbexp.c
+===================================================================
+--- libmatchbox-1.9.orig/libmb/mbexp.c
++++ libmatchbox-1.9/libmb/mbexp.c
+@@ -492,7 +492,7 @@
+
+ /* get the family */
+
+- if (index(spec, ',') != NULL || index(spec, '-') != NULL)
++ if (strchr(spec, ',') != NULL || strchr(spec, '-') != NULL)
+ has_comma_delim = True;
+
+ while (!got_family) {
+Index: libmatchbox-1.9/libmb/mbmenu.c
+===================================================================
+--- libmatchbox-1.9.orig/libmb/mbmenu.c
++++ libmatchbox-1.9/libmb/mbmenu.c
+@@ -433,7 +433,7 @@
+ {
+ s = p;
+ found = NULL;
+- while(index("/\0", *p) == NULL) p++;
++ while(strchr("/\0", *p) == NULL) p++;
+ if (*p != '\0') { *p = '\0'; p++; };
+
+ item = current->items;
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
new file mode 100644
index 000000000..817a8da8f
--- /dev/null
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -0,0 +1,58 @@
+#############################################################
+#
+# MatchBox LIB
+#
+#############################################################
+
+MATCHBOX_LIB_VERSION = 1.9
+MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
+MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_INSTALL_STAGING = YES
+MATCHBOX_LIB_DEPENDENCIES = host-pkg-config expat xlib_libXext
+MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
+
+define MATCHBOX_LIB_POST_INSTALL_FIXES
+ $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
+endef
+
+MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
+
+#############################################################
+
+ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
+ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
+ MATCHBOX_LIB_DEPENDENCIES+=xlib_libXpm
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+ MATCHBOX_LIB_CONF_OPT+=--enable-jpeg
+ MATCHBOX_LIB_DEPENDENCIES+=jpeg
+else
+ MATCHBOX_LIB_CONF_OPT+=--disable-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+ MATCHBOX_LIB_CONF_OPT+=--enable-png
+ MATCHBOX_LIB_DEPENDENCIES+=libpng
+else
+ MATCHBOX_LIB_CONF_OPT+=--disable-png
+endif
+
+ifeq ($(BR2_PACKAGE_PANGO),y)
+ MATCHBOX_LIB_CONF_OPT+=--enable-pango
+ MATCHBOX_LIB_DEPENDENCIES+=pango
+else
+ MATCHBOX_LIB_CONF_OPT+=--disable-pango
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
+ MATCHBOX_LIB_CONF_OPT+=--enable-xft
+ MATCHBOX_LIB_DEPENDENCIES+=xlib_libXft
+else
+ MATCHBOX_LIB_CONF_OPT+=--disable-xft
+endif
+
+#############################################################
+
+$(eval $(call AUTOTARGETS,package/matchbox,matchbox-lib))