aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2010-11-05 17:14:13 -0300
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-11-19 07:24:15 +0100
commit3693cdb6e4e4d2e1ee264067a559cead2a553da7 (patch)
tree58d026b6441b538f5b44fea9aa69dd2c25fd481b /package
parente855e2b2de71b6172822e2ed81bec4ddbd82aeb4 (diff)
downloadbuildroot-3693cdb6e4e4d2e1ee264067a559cead2a553da7.tar.gz
buildroot-3693cdb6e4e4d2e1ee264067a559cead2a553da7.tar.bz2
midori: bump to 0.2.9 and make it build with directfb
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
-rw-r--r--package/midori/midori.mk19
1 files changed, 13 insertions, 6 deletions
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index ffee596fbf..af227d4eb1 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -4,19 +4,26 @@
#
#############################################################
-MIDORI_VERSION = 0.2.6
+MIDORI_VERSION = 0.2.9
MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
-MIDORI_INSTALL_STAGING = NO
MIDORI_INSTALL_TARGET = YES
MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
+ifneq ($(BR2_PACKAGE_XORG7),y)
+define MIDORI_WITHOUT_X11
+ $(SED) "s/check_pkg ('x11')/#check_pkg ('x11')/" $(@D)/wscript
+endef
+endif
+
define MIDORI_CONFIGURE_CMDS
- (cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
- ./waf configure \
- --prefix=/usr \
+ $(MIDORI_WITHOUT_X11)
+ (cd $(@D); \
+ $(TARGET_CONFIGURE_OPTS) \
+ ./waf configure \
+ --prefix=/usr \
+ --disable-vala \
)
endef