diff options
| author | Will Newton <will.newton@gmail.com> | 2009-06-29 11:54:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-02 22:15:12 +0200 |
| commit | 81f9990e021011146537c106190116d728477329 (patch) | |
| tree | 5e1c60c91786447d3a49bd684da67c41db31f945 /package | |
| parent | 4840c451d93afb59725900b1d6ca84645113b897 (diff) | |
webkit: Update to WebKit svn r44552.
Closes #427
- Fix generation of configure script and Makefiles.
- Add dependencies on libsoup and enchant.
- Allow configuration of rendering target (currently X11 or DirectFB).
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/webkit/Config.in | 21 | ||||
| -rw-r--r-- | package/webkit/webkit.mk | 23 |
2 files changed, 39 insertions, 5 deletions
diff --git a/package/webkit/Config.in b/package/webkit/Config.in index 9e3419aa7..e436f9acf 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -8,10 +8,27 @@ config BR2_PACKAGE_WEBKIT select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_ENCHANT + select BR2_PACKAGE_LIBSOUP help - WebKit is an open source, standards compliant web browser engine. + WebKit is an open source, standards compliant web browser engine. - http://webkit.org/ + http://webkit.org/ comment "webkit requires a toolchain with C++ support and WCHAR enabled" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + +choice + prompt "Rendering target" + default BR2_PACKAGE_WEBKIT_X + help + Selects which rendering target will be used. + +config BR2_PACKAGE_WEBKIT_X11 + bool "X11" + +config BR2_PACKAGE_WEBKIT_DIRECTFB + bool "DirectFB" + select BR2_PACKAGE_DIRECTFB + +endchoice diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index b070c1d14..17f1318f9 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -3,7 +3,7 @@ # webkit # ############################################################# -WEBKIT_VERSION = r31321 +WEBKIT_VERSION = r44552 WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2 WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/ @@ -11,7 +11,24 @@ WEBKIT_INSTALL_STAGING = YES WEBKIT_INSTALL_TARGET = YES WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install -WEBKIT_AUTORECONF = YES -WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite +WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite enchant \ + libsoup + +ifeq ($(BR2_PACKAGE_WEBKIT_X11),y) +WEBKIT_CONF_OPT = --with-target=x11 +endif + +ifeq ($(BR2_PACKAGE_WEBKIT_DIRECTFB),y) +WEBKIT_CONF_OPT = --with-target=directfb +endif + +WEBKIT_CONF_OPT += --disable-video $(eval $(call AUTOTARGETS,package,webkit)) + +$(WEBKIT_HOOK_POST_EXTRACT): + $(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh + $(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh + # Don't run the configure step yet + cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh + touch $@ |