summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-30 14:58:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:12:36 (GMT)
commit663c893b084333ea9703079a9b056d74ffa5e2a3 (patch)
tree9412e95a7d73731b6ebe067501ac434ffe2246dd /meta/recipes-sato/webkit
parent551ffe9ed72a0e7a16735d7173c3d51fe8282a54 (diff)
downloadpoky-663c893b084333ea9703079a9b056d74ffa5e2a3.tar.gz
webkit-gtk svn: update to r101488
tested on beagleboard/angstrom with midori and epiphany browsers (From OE-Core rev: c8c9a17ae2603ccb34641d4188850a18e6ce6096) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/files/GNUmakefile.am37
-rwxr-xr-xmeta/recipes-sato/webkit/files/autogen.sh1
-rw-r--r--meta/recipes-sato/webkit/files/configure.ac395
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb9
4 files changed, 232 insertions, 210 deletions
diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index fb10790..4d2785f 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -27,7 +27,8 @@ VPATH = @srcdir@
27 27
28DISTCHECK_CONFIGURE_FLAGS = \ 28DISTCHECK_CONFIGURE_FLAGS = \
29 --enable-introspection \ 29 --enable-introspection \
30 --enable-gtk-doc 30 --enable-gtk-doc \
31 --enable-webkit2
31 32
32# Directory for autogenerated sources 33# Directory for autogenerated sources
33GENSOURCES := $(top_builddir)/DerivedSources 34GENSOURCES := $(top_builddir)/DerivedSources
@@ -40,10 +41,13 @@ GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
40WebCore := $(srcdir)/Source/WebCore 41WebCore := $(srcdir)/Source/WebCore
41WebKit := $(srcdir)/Source/WebKit/gtk 42WebKit := $(srcdir)/Source/WebKit/gtk
42WebKit2 := $(srcdir)/Source/WebKit2 43WebKit2 := $(srcdir)/Source/WebKit2
44pkgconfigdir := $(libdir)/pkgconfig
45libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
43 46
44# Libraries and support components 47# Libraries and support components
45bin_PROGRAMS := 48bin_PROGRAMS :=
46noinst_PROGRAMS := 49noinst_PROGRAMS :=
50libexec_PROGRAMS :=
47noinst_HEADERS := 51noinst_HEADERS :=
48noinst_LTLIBRARIES := 52noinst_LTLIBRARIES :=
49lib_LTLIBRARIES := 53lib_LTLIBRARIES :=
@@ -73,6 +77,8 @@ webkitgtk_gdom_built_sources :=
73webkitgtk_built_sources := 77webkitgtk_built_sources :=
74webkitgtk_built_nosources := 78webkitgtk_built_nosources :=
75webkit2_built_sources := 79webkit2_built_sources :=
80webkit2_plugin_process_built_sources :=
81webkittestrunner_built_sources :=
76libwebcoreinternals_built_sources := 82libwebcoreinternals_built_sources :=
77global_cppflags := 83global_cppflags :=
78global_cflags := 84global_cflags :=
@@ -85,8 +91,10 @@ typelibs_DATA :=
85EXTRA_DIST := 91EXTRA_DIST :=
86BUILT_SOURCES := 92BUILT_SOURCES :=
87CLEANFILES := 93CLEANFILES :=
94DOMAIN :=
88DISTCLEANFILES := 95DISTCLEANFILES :=
89MAINTAINERCLEANFILES := 96MAINTAINERCLEANFILES :=
97pkgconfig_DATA :=
90 98
91# We do not care at all about this implicit built-in make rules, 99# We do not care at all about this implicit built-in make rules,
92# disable them to save some build time 100# disable them to save some build time
@@ -187,11 +195,13 @@ endif
187 195
188EXTRA_DIST += \ 196EXTRA_DIST += \
189 $(srcdir)/Source/autotools/symbols.filter \ 197 $(srcdir)/Source/autotools/symbols.filter \
190 $(srcdir)/gtk-doc.make \
191 $(srcdir)/Source/WebKit/LICENSE 198 $(srcdir)/Source/WebKit/LICENSE
192 199
193# Include module makefiles 200# Include module makefiles
201if USE_JSC
194include Source/JavaScriptCore/GNUmakefile.am 202include Source/JavaScriptCore/GNUmakefile.am
203endif
204
195include Source/WebCore/GNUmakefile.am 205include Source/WebCore/GNUmakefile.am
196include Source/WebKit/gtk/GNUmakefile.am 206include Source/WebKit/gtk/GNUmakefile.am
197include Source/WebCore/bindings/gobject/GNUmakefile.am 207include Source/WebCore/bindings/gobject/GNUmakefile.am
@@ -201,6 +211,7 @@ include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
201 211
202if ENABLE_WEBKIT2 212if ENABLE_WEBKIT2
203include Source/WebKit2/GNUmakefile.am 213include Source/WebKit2/GNUmakefile.am
214include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
204include Tools/MiniBrowser/gtk/GNUmakefile.am 215include Tools/MiniBrowser/gtk/GNUmakefile.am
205include Tools/WebKitTestRunner/GNUmakefile.am 216include Tools/WebKitTestRunner/GNUmakefile.am
206# [GTK] Refactor the translations now that we have webkit2 217# [GTK] Refactor the translations now that we have webkit2
@@ -209,13 +220,17 @@ endif
209 220
210# Autogenerated sources 221# Autogenerated sources
211BUILT_SOURCES += \ 222BUILT_SOURCES += \
212 $(javascriptcore_built_sources) \
213 $(javascriptcore_built_nosources) \
214 $(webcore_built_sources) \ 223 $(webcore_built_sources) \
215 $(webcore_built_nosources) \ 224 $(webcore_built_nosources) \
216 $(webkitgtk_built_sources) \ 225 $(webkitgtk_built_sources) \
217 $(webkitgtk_built_nosources) 226 $(webkitgtk_built_nosources)
218 227
228if USE_JSC
229BUILT_SOURCES += \
230 $(javascriptcore_built_sources) \
231 $(javascriptcore_built_nosources)
232endif
233
219DISTCLEANFILES += \ 234DISTCLEANFILES += \
220 $(CLEANFILES) \ 235 $(CLEANFILES) \
221 $(builddir)/doltcompile \ 236 $(builddir)/doltcompile \
@@ -249,3 +264,17 @@ clean-local:
249maintainer-clean-local: distclean-local 264maintainer-clean-local: distclean-local
250distclean-local: 265distclean-local:
251 -rm -rf $(GENSOURCES) $(GENPROGRAMS) 266 -rm -rf $(GENSOURCES) $(GENPROGRAMS)
267
268dist-hook: doc-dist-hook
269doc-dist-hook: docs-build.stamp
270 cp $(WebKit)/NEWS $(distdir)
271 @mkdir -p $(distdir)/Documentation/webkitgtk/html
272 @mkdir -p $(distdir)/Documentation/webkitgtk/tmpl
273 @-cp ./Documentation/webkitgtk/tmpl/*.sgml $(distdir)/Documentation/webkitgtk/tmpl
274 @cp ./Documentation/webkitgtk/html/* $(distdir)/Documentation/webkitgtk/html
275if ENABLE_WEBKIT2
276 @mkdir -p $(distdir)/Documentation/webkit2gtk/html
277 @mkdir -p $(distdir)/Documentation/webkit2gtk/tmpl
278 @-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
279 @cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
280endif
diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 23639e8..bb7779d 100755
--- a/meta/recipes-sato/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
@@ -12,7 +12,6 @@ rm -f $top_srcdir/autom4te.cache
12 12
13touch README INSTALL 13touch README INSTALL
14 14
15gtkdocize --copy > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
16if test -z `which autoreconf`; then 15if test -z `which autoreconf`; then
17 echo "Error: autoreconf not found, please install it." 16 echo "Error: autoreconf not found, please install it."
18 exit 1 17 exit 1
diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index 9d8ad90..65176ae 100644
--- a/meta/recipes-sato/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
@@ -1,15 +1,15 @@
1AC_PREREQ(2.59) 1AC_PREREQ(2.59)
2 2
3m4_define([webkit_major_version], [1]) 3m4_define([webkit_major_version], [1])
4m4_define([webkit_minor_version], [5]) 4m4_define([webkit_minor_version], [7])
5m4_define([webkit_micro_version], [1]) 5m4_define([webkit_micro_version], [2])
6 6
7# This is the version we'll be using as part of our User-Agent string 7# This is the version we'll be using as part of our User-Agent string
8# e.g., AppleWebKit/$(webkit_user_agent_version) ... 8# e.g., AppleWebKit/$(webkit_user_agent_version) ...
9# 9#
10# Sourced from Source/WebCore/Configurations/Version.xcconfig 10# Sourced from Source/WebCore/Configurations/Version.xcconfig
11m4_define([webkit_user_agent_major_version], [534]) 11m4_define([webkit_user_agent_major_version], [535])
12m4_define([webkit_user_agent_minor_version], [26]) 12m4_define([webkit_user_agent_minor_version], [10])
13 13
14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) 14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
15 15
@@ -35,10 +35,10 @@ AC_CONFIG_SRCDIR([Source/WebCore/config.h])
35 35
36dnl # Libtool library version, not to confuse with API version 36dnl # Libtool library version, not to confuse with API version
37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html 37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
38LIBWEBKITGTK_VERSION=8:0:8 38LIBWEBKITGTK_VERSION=11:2:11
39AC_SUBST([LIBWEBKITGTK_VERSION]) 39AC_SUBST([LIBWEBKITGTK_VERSION])
40 40
41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) 41AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
42 42
43# Use AM_SILENT_RULES if present 43# Use AM_SILENT_RULES if present
44m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 44m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -111,6 +111,9 @@ if test "$os_win32" = "no"; then
111AC_CHECK_HEADERS([pthread.h], 111AC_CHECK_HEADERS([pthread.h],
112 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), 112 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
113 AC_MSG_ERROR([pthread support is required to build WebKit])) 113 AC_MSG_ERROR([pthread support is required to build WebKit]))
114AC_CHECK_LIB(pthread, pthread_rwlock_init,
115 AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
116 AC_MSG_WARN([pthread rwlock support is not available]))
114fi 117fi
115 118
116# check for libjpeg the way Gtk does it. 119# check for libjpeg the way Gtk does it.
@@ -188,32 +191,37 @@ AC_SUBST([OLE32_LIBS])
188# determine the GTK+ version to use 191# determine the GTK+ version to use
189AC_MSG_CHECKING([the GTK+ version to use]) 192AC_MSG_CHECKING([the GTK+ version to use])
190AC_ARG_WITH([gtk], 193AC_ARG_WITH([gtk],
191 [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])], 194 [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 3.0)])],
192 [case "$with_gtk" in 195 [case "$with_gtk" in
193 2.0|3.0) ;; 196 2.0|3.0) ;;
194 *) AC_MSG_ERROR([invalid GTK+ version specified]) ;; 197 *) AC_MSG_ERROR([invalid GTK+ version specified]) ;;
195 esac], 198 esac],
196 [with_gtk=2.0]) 199 [with_gtk=3.0])
197AC_MSG_RESULT([$with_gtk]) 200AC_MSG_RESULT([$with_gtk])
198 201
202GTK2_REQUIRED_VERSION=2.10
203GAIL2_REQUIRED_VERSION=1.8
204GTK3_REQUIRED_VERSION=3.0
205GAIL3_REQUIRED_VERSION=3.0
206
199case "$with_gtk" in 207case "$with_gtk" in
200 2.0) GTK_REQUIRED_VERSION=2.10 208 2.0) GTK_REQUIRED_VERSION=$GTK2_REQUIRED_VERSION
201 GTK_API_VERSION=2.0 209 GTK_API_VERSION=2.0
202 WEBKITGTK_API_MAJOR_VERSION=1 210 WEBKITGTK_API_MAJOR_VERSION=1
203 WEBKITGTK_API_MINOR_VERSION=0 211 WEBKITGTK_API_MINOR_VERSION=0
204 WEBKITGTK_API_VERSION=1.0 212 WEBKITGTK_API_VERSION=1.0
205 WEBKITGTK_PC_NAME=webkit 213 WEBKITGTK_PC_NAME=webkit
206 GAIL_PC_NAME=gail 214 GAIL_PC_NAME=gail
207 GAIL_REQUIRED_VERSION=1.8 215 GAIL_REQUIRED_VERSION=$GAIL2_REQUIRED_VERSION
208 ;; 216 ;;
209 3.0) GTK_REQUIRED_VERSION=3.0 217 3.0) GTK_REQUIRED_VERSION=$GTK3_REQUIRED_VERSION
210 GTK_API_VERSION=3.0 218 GTK_API_VERSION=3.0
211 WEBKITGTK_API_MAJOR_VERSION=3 219 WEBKITGTK_API_MAJOR_VERSION=3
212 WEBKITGTK_API_MINOR_VERSION=0 220 WEBKITGTK_API_MINOR_VERSION=0
213 WEBKITGTK_API_VERSION=3.0 221 WEBKITGTK_API_VERSION=3.0
214 WEBKITGTK_PC_NAME=webkitgtk 222 WEBKITGTK_PC_NAME=webkitgtk
215 GAIL_PC_NAME=gail-3.0 223 GAIL_PC_NAME=gail-3.0
216 GAIL_REQUIRED_VERSION=3.0 224 GAIL_REQUIRED_VERSION=$GAIL3_REQUIRED_VERSION
217 ;; 225 ;;
218esac 226esac
219 227
@@ -267,8 +275,9 @@ PANGO_REQUIRED_VERSION=1.12
267LIBXSLT_REQUIRED_VERSION=1.1.7 275LIBXSLT_REQUIRED_VERSION=1.1.7
268SQLITE_REQUIRED_VERSION=3.0 276SQLITE_REQUIRED_VERSION=3.0
269GSTREAMER_REQUIRED_VERSION=0.10 277GSTREAMER_REQUIRED_VERSION=0.10
270GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25 278GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
271ENCHANT_REQUIRED_VERSION=0.22 279ENCHANT_REQUIRED_VERSION=0.22
280LIBFFTW_REQUIRED_VERSION=3.2.2
272 281
273# Available modules 282# Available modules
274# 283#
@@ -373,15 +382,14 @@ AC_MSG_RESULT([$enable_3d_rendering])
373# check whether to enable WebGL support 382# check whether to enable WebGL support
374AC_MSG_CHECKING([whether to enable WebGL support]) 383AC_MSG_CHECKING([whether to enable WebGL support])
375AC_ARG_ENABLE(webgl, 384AC_ARG_ENABLE(webgl,
376 AC_HELP_STRING([--enable-webgl], 385 AC_HELP_STRING([--enable-webgl], [enable support for WebGL [default=yes]]),
377 [enable support for WebGL (experimental) [default=no]]), 386 [], [if test "$with_target" = "x11"; then enable_webgl="yes"; else enable_webgl="no"; fi])
378 [], [enable_webgl="no"])
379AC_MSG_RESULT([$enable_webgl]) 387AC_MSG_RESULT([$enable_webgl])
380 388
381if test "$enable_webgl" = "yes"; then 389if test "$enable_webgl" = "yes"; then
382 AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found])) 390 AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
383 AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found])) 391 AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
384 OPENGL_LIBS=-lGL 392 OPENGL_LIBS="-lGL -ldl"
385fi 393fi
386AC_SUBST([OPENGL_LIBS]) 394AC_SUBST([OPENGL_LIBS])
387 395
@@ -409,6 +417,14 @@ AC_ARG_ENABLE(meter_tag,
409 [],[enable_meter_tag="yes"]) 417 [],[enable_meter_tag="yes"])
410AC_MSG_RESULT([$enable_meter_tag]) 418AC_MSG_RESULT([$enable_meter_tag])
411 419
420# check whether to enable HTML5 Microdata support
421AC_MSG_CHECKING([whether to enable HTML5 Microdata support])
422AC_ARG_ENABLE(microdata,
423 AC_HELP_STRING([--enable-microdata],
424 [enable HTML5 microdata support [default=no]]),
425 [],[enable_microdata="no"])
426AC_MSG_RESULT([$enable_microdata])
427
412# check whether to enable page visibility API. 428# check whether to enable page visibility API.
413AC_MSG_CHECKING([whether to enable Page Visibility API support]) 429AC_MSG_CHECKING([whether to enable Page Visibility API support])
414AC_ARG_ENABLE(page_visibility_api, 430AC_ARG_ENABLE(page_visibility_api,
@@ -433,6 +449,14 @@ AC_ARG_ENABLE(javascript_debugger,
433 [],[enable_javascript_debugger="yes"]) 449 [],[enable_javascript_debugger="yes"])
434AC_MSG_RESULT([$enable_javascript_debugger]) 450AC_MSG_RESULT([$enable_javascript_debugger])
435 451
452# check whether to enable Gamepad support
453AC_MSG_CHECKING([whether to enable Gamepad support])
454AC_ARG_ENABLE(gamepad,
455 AC_HELP_STRING([--enable-gamepad],
456 [enable Gamepad support [default=no]]),
457 [],[enable_gamepad="no"])
458AC_MSG_RESULT([$enable_gamepad])
459
436# check whether to build with datagrid support 460# check whether to build with datagrid support
437AC_MSG_CHECKING([whether to enable HTML5 datagrid support]) 461AC_MSG_CHECKING([whether to enable HTML5 datagrid support])
438AC_ARG_ENABLE(datagrid, 462AC_ARG_ENABLE(datagrid,
@@ -449,13 +473,13 @@ AC_ARG_ENABLE(data_transfer_items,
449 [],[enable_data_transfer_items="no"]) 473 [],[enable_data_transfer_items="no"])
450AC_MSG_RESULT([$enable_data_transfer_items]) 474AC_MSG_RESULT([$enable_data_transfer_items])
451 475
452# check whether to enable HTML5 Offline Web Applications support 476# check whether to enable DOM mutation observer support
453AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) 477AC_MSG_CHECKING([whether to enable DOM mutation observer support])
454AC_ARG_ENABLE(offline_web_applications, 478AC_ARG_ENABLE(mutation_observers,
455 AC_HELP_STRING([--enable-offline-web-applications], 479 AC_HELP_STRING([--enable-mutation-observers],
456 [enable HTML5 offline web applications support [default=yes]]), 480 [enable DOM mutation observer support [default=no]]),
457 [],[enable_offline_web_applications="yes"]) 481 [],[enable_mutation_observers="no"])
458AC_MSG_RESULT([$enable_offline_web_applications]) 482AC_MSG_RESULT([$enable_mutation_observers])
459 483
460# check whether to enable HTML5 client-side session and persitent storage support 484# check whether to enable HTML5 client-side session and persitent storage support
461AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) 485AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support])
@@ -489,21 +513,13 @@ AC_ARG_ENABLE(input_speech,
489 [],[enable_input_speech="no"]) 513 [],[enable_input_speech="no"])
490AC_MSG_RESULT([$enable_input_speech]) 514AC_MSG_RESULT([$enable_input_speech])
491 515
492# check whether to build with database support 516# check whether to build with SQL database support
493AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) 517AC_MSG_CHECKING([whether to enable SQL client-side database storage support])
494AC_ARG_ENABLE(database, 518AC_ARG_ENABLE(sql_database,
495 AC_HELP_STRING([--enable-database], 519 AC_HELP_STRING([--enable-sql-database],
496 [enable HTML5 client-side database storage support [default=yes]]), 520 [enable SQL client-side database storage support [default=yes]]),
497 [],[enable_database="yes"]) 521 [],[enable_sql_database="yes"])
498AC_MSG_RESULT([$enable_database]) 522AC_MSG_RESULT([$enable_sql_database])
499
500# check whether to build with server-sent events support
501AC_MSG_CHECKING([whether to enable HTML5 server-sent events support])
502AC_ARG_ENABLE(eventsource,
503 AC_HELP_STRING([--enable-eventsource],
504 [enable HTML5 server-sent events support [default=yes]]),
505 [],[enable_eventsource="yes"])
506AC_MSG_RESULT([$enable_eventsource])
507 523
508# check whether to build with icon database support 524# check whether to build with icon database support
509AC_MSG_CHECKING([whether to enable icon database support]) 525AC_MSG_CHECKING([whether to enable icon database support])
@@ -554,10 +570,18 @@ fi
554AC_MSG_CHECKING([whether to enable HTML5 video track support]) 570AC_MSG_CHECKING([whether to enable HTML5 video track support])
555AC_ARG_ENABLE(video_track, 571AC_ARG_ENABLE(video_track,
556 AC_HELP_STRING([--enable-video-track], 572 AC_HELP_STRING([--enable-video-track],
557 [enable HTML5 video track support [default=yes]]), 573 [enable HTML5 video track support [default=no]]),
558 [],[enable_video_track="yes"]) 574 [],[enable_video_track="no"])
559AC_MSG_RESULT([$enable_video_track]) 575AC_MSG_RESULT([$enable_video_track])
560 576
577# check whether to enable media source support
578AC_MSG_CHECKING([whether to enable media source support])
579AC_ARG_ENABLE(media_source,
580 AC_HELP_STRING([--enable-media-source],
581 [enable support for media source [default=no]]),
582 [], [enable_media_source="no"])
583AC_MSG_RESULT([$enable_media_source])
584
561# check whether to enable media statistics support 585# check whether to enable media statistics support
562AC_MSG_CHECKING([whether to enable media statistics support]) 586AC_MSG_CHECKING([whether to enable media statistics support])
563AC_ARG_ENABLE(media_statistics, 587AC_ARG_ENABLE(media_statistics,
@@ -582,22 +606,6 @@ AC_ARG_ENABLE(media_stream,
582 [],[enable_media_stream="no"]) 606 [],[enable_media_stream="no"])
583AC_MSG_RESULT([$enable_media_stream]) 607AC_MSG_RESULT([$enable_media_stream])
584 608
585# check whether to enable XHTML-MP support
586AC_MSG_CHECKING([whether to enable XHTML-MP support])
587AC_ARG_ENABLE(xhtmlmp,
588 AC_HELP_STRING([--enable-xhtmlmp],
589 [enable support for XHTML-MP [default=no]]),
590 [],[enable_xhtmlmp="no"])
591AC_MSG_RESULT([$enable_xhtmlmp])
592
593# check whether to enable XPath support
594AC_MSG_CHECKING([whether to enable XPath support])
595AC_ARG_ENABLE(xpath,
596 AC_HELP_STRING([--enable-xpath],
597 [enable support for XPath [default=yes]]),
598 [],[enable_xpath="yes"])
599AC_MSG_RESULT([$enable_xpath])
600
601# check whether to enable XSLT support 609# check whether to enable XSLT support
602AC_MSG_CHECKING([whether to enable XSLT support]) 610AC_MSG_CHECKING([whether to enable XSLT support])
603AC_ARG_ENABLE(xslt, 611AC_ARG_ENABLE(xslt,
@@ -614,14 +622,6 @@ AC_ARG_ENABLE(geolocation,
614 [],[enable_geolocation="no"]) 622 [],[enable_geolocation="no"])
615AC_MSG_RESULT([$enable_geolocation]) 623AC_MSG_RESULT([$enable_geolocation])
616 624
617# check whether to enable client-based geolocation support
618AC_MSG_CHECKING([whether to enable client-based geolocation support])
619AC_ARG_ENABLE(client_based_geolocation,
620 AC_HELP_STRING([--enable-client-based-geolocation],
621 [enable support for client-based geolocation [default=no]]),
622 [],[enable_client_based_geolocation="no"])
623AC_MSG_RESULT([$enable_client_based_geolocation])
624
625# check whether to enable MathML support 625# check whether to enable MathML support
626AC_MSG_CHECKING([whether to enable MathML support]) 626AC_MSG_CHECKING([whether to enable MathML support])
627AC_ARG_ENABLE(mathml, 627AC_ARG_ENABLE(mathml,
@@ -638,14 +638,6 @@ AC_ARG_ENABLE(svg,
638 [],[enable_svg="yes"]) 638 [],[enable_svg="yes"])
639AC_MSG_RESULT([$enable_svg]) 639AC_MSG_RESULT([$enable_svg])
640 640
641# check whether to enable WCSS support
642AC_MSG_CHECKING([whether to enable WCSS support])
643AC_ARG_ENABLE(wcss,
644 AC_HELP_STRING([--enable-wcss],
645 [enable support for WCSS [default=no]]),
646 [],[enable_wcss="no"])
647AC_MSG_RESULT([$enable_wcss])
648
649# check whether to enable SharedWorkers support 641# check whether to enable SharedWorkers support
650AC_MSG_CHECKING([whether to enable SharedWorkers support]) 642AC_MSG_CHECKING([whether to enable SharedWorkers support])
651AC_ARG_ENABLE(shared_workers, 643AC_ARG_ENABLE(shared_workers,
@@ -678,6 +670,14 @@ AC_ARG_ENABLE(file_system,
678 [], [enable_file_system="no"]) 670 [], [enable_file_system="no"])
679AC_MSG_RESULT([$enable_file_system]) 671AC_MSG_RESULT([$enable_file_system])
680 672
673# check whether to enable HTML5 <style scoped> support
674AC_MSG_CHECKING([whether to enable HTML5 <style scoped> support])
675AC_ARG_ENABLE(file_system,
676 AC_HELP_STRING([--enable-style-scoped],
677 [enable support for HTML5 <style scoped> [default=no]]),
678 [], [enable_style_scoped="no"])
679AC_MSG_RESULT([$enable_style_scoped])
680
681# check whether to enable Quota API support 681# check whether to enable Quota API support
682AC_MSG_CHECKING([whether to enable Quota API support]) 682AC_MSG_CHECKING([whether to enable Quota API support])
683AC_ARG_ENABLE(quota, 683AC_ARG_ENABLE(quota,
@@ -688,21 +688,9 @@ AC_MSG_RESULT([$enable_quota])
688 688
689# turn off svg features if --disable-svg is requested 689# turn off svg features if --disable-svg is requested
690if test "$enable_svg" = "no"; then 690if test "$enable_svg" = "no"; then
691 enable_svg_animation=no
692 enable_svg_fonts=no 691 enable_svg_fonts=no
693 enable_svg_foreign_object=no
694 enable_svg_as_image=no
695 enable_svg_use=no
696fi 692fi
697 693
698# check whether to enable support for SVG animation
699AC_MSG_CHECKING([whether to enable support for SVG animation])
700AC_ARG_ENABLE(svg_animation,
701 AC_HELP_STRING([--enable-svg-animation],
702 [enable support for SVG animation (experimental) [default=yes]]),
703 [],[enable_svg_animation="yes"])
704AC_MSG_RESULT([$enable_svg_animation])
705
706# check whether to enable support for filters 694# check whether to enable support for filters
707AC_MSG_CHECKING([whether to enable support for filters]) 695AC_MSG_CHECKING([whether to enable support for filters])
708AC_ARG_ENABLE(filters, 696AC_ARG_ENABLE(filters,
@@ -719,36 +707,8 @@ AC_ARG_ENABLE(svg_fonts,
719 [],[enable_svg_fonts="yes"]) 707 [],[enable_svg_fonts="yes"])
720AC_MSG_RESULT([$enable_svg_fonts]) 708AC_MSG_RESULT([$enable_svg_fonts])
721 709
722# check whether to enable foreign objects support for SVG
723AC_MSG_CHECKING([whether to enable support for SVG foreign objects])
724AC_ARG_ENABLE(svg_foreign_object,
725 AC_HELP_STRING([--enable-svg-foreign-object],
726 [enable support for SVG foreign objects (experimental) [default=yes]]),
727 [],[enable_svg_foreign_object="yes"])
728AC_MSG_RESULT([$enable_svg_foreign_object])
729
730# check whether to enable SVG As Image support
731AC_MSG_CHECKING([whether to enable SVG as Image support])
732AC_ARG_ENABLE(svg_as_image,
733 AC_HELP_STRING([--enable-svg-as-image],
734 [enable SVG as Image support (experimental) [default=yes]]),
735 [],[enable_svg_as_image="yes"])
736AC_MSG_RESULT([$enable_svg_as_image])
737
738# check whether to enable SVG USE element support
739AC_MSG_CHECKING([whether to enable support for SVG use element])
740AC_ARG_ENABLE(svg_use,
741 AC_HELP_STRING([--enable-svg-use],
742 [enable SVG use element support (experimental) [default=yes]]),
743 [],[enable_svg_use="yes"])
744AC_MSG_RESULT([$enable_svg_use])
745
746# check for SVG features, enabling SVG if necessary 710# check for SVG features, enabling SVG if necessary
747if test "$enable_svg_animation" = "yes" || \ 711if test "$enable_svg_fonts" = "yes"; then
748 test "$enable_svg_fonts" = "yes" || \
749 test "$enable_svg_foreign_object" = "yes" || \
750 test "$enable_svg_as_image" = "yes" || \
751 test "$enable_svg_use" = "yes"; then
752 svg_flags=yes 712 svg_flags=yes
753 if test "$enable_svg" = "no"; then 713 if test "$enable_svg" = "no"; then
754 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) 714 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
@@ -765,11 +725,7 @@ AC_ARG_ENABLE(web_sockets,
765AC_MSG_RESULT([$enable_web_sockets]) 725AC_MSG_RESULT([$enable_web_sockets])
766 726
767# check whether to enable Web Audio support 727# check whether to enable Web Audio support
768AC_MSG_CHECKING([whether to enable Web Audio support]) 728enable_web_audio=no
769AC_ARG_ENABLE(web_audio,
770 AC_HELP_STRING([--enable-web-audio],
771 [enable support for Web Audio [default=no]]),
772 [],[enable_web_audio="no"])
773AC_MSG_RESULT([$enable_web_audio]) 729AC_MSG_RESULT([$enable_web_audio])
774 730
775# check whether to enable Web Timing support 731# check whether to enable Web Timing support
@@ -828,48 +784,67 @@ AC_ARG_ENABLE(debug_features,
828 [],[if test "$enable_debug" = "yes"; then enable_debug_features="yes"; else enable_debug_features="no"; fi]) 784 [],[if test "$enable_debug" = "yes"; then enable_debug_features="yes"; else enable_debug_features="no"; fi])
829AC_MSG_RESULT([$enable_debug_features]) 785AC_MSG_RESULT([$enable_debug_features])
830 786
831AC_MSG_CHECKING([whether to enable JIT compilation]) 787# Determine JavaScript engine to use.
832AC_ARG_ENABLE([jit], 788AC_MSG_CHECKING([Javascript engine])
833 AC_HELP_STRING([--enable-jit], 789AC_ARG_WITH(jsengine,
834 [Enable JIT compilation default=yes]), 790 AC_HELP_STRING([--with-jsengine=@<:@jsc@:>@],
835 [],[enable_jit="yes"]) 791 [Select Javascript engine [default=jsc]]),
836if test "$enable_jit" = "yes"; then 792 [],[with_jsengine="jsc"])
837 case "$host_cpu" in 793
838 arm*) 794case "$with_jsengine" in
839 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) 795 jsc) ;;
840 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) 796 *) AC_MSG_ERROR([Invalid JS engine: Must be jsc]) ;;
841 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) 797esac
842 ;; 798AC_MSG_RESULT([$with_jsengine])
843 i*86|x86_64) 799
844 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) 800if test "$with_jsengine" = "jsc"; then
845 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) 801 AC_MSG_CHECKING([whether to enable JIT compilation])
846 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) 802 AC_ARG_ENABLE([jit],
847 AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls]) 803 AC_HELP_STRING([--enable-jit],
848 AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access]) 804 [Enable JIT compilation default=yes]),
849 AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic]) 805 [],[enable_jit="yes"])
850 case "$host_cpu" in 806 if test "$enable_jit" = "yes"; then
851 i*86) 807 case "$host_cpu" in
852 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list]) 808 arm*)
853 ;; 809 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
854 x86_64) 810 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
855 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register]) 811 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
856 AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate]) 812 ;;
857 ;; 813 i*86|x86_64)
858 esac 814 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
859 ;; 815 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
860 sh4) 816 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
861 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) 817 AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
862 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) 818 AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access])
863 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) 819 AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic])
864 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register]) 820 case "$host_cpu" in
865 ;; 821 i*86)
866 *) 822 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list])
867 enable_jit="no (CPU '$host_cpu' not supported)" 823 ;;
868 ;; 824 x86_64)
869 esac 825 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
826 AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate])
827 ;;
828 esac
829 ;;
830 sh4)
831 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
832 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
833 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
834 AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register])
835 ;;
836 *)
837 enable_jit="no (CPU '$host_cpu' not supported)"
838 ;;
839 esac
840 else
841 AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
842 fi
870else 843else
871 AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT]) 844 AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
845 enable_jit="no"
872fi 846fi
847
873AC_MSG_RESULT([$enable_jit]) 848AC_MSG_RESULT([$enable_jit])
874 849
875# Opcode stats 850# Opcode stats
@@ -912,6 +887,14 @@ AC_ARG_ENABLE(animation_api,
912 [], [enable_animation_api="no"]) 887 [], [enable_animation_api="no"])
913AC_MSG_RESULT([$enable_animation_api]) 888AC_MSG_RESULT([$enable_animation_api])
914 889
890# check whether to enable requestAnimationFrame support
891AC_MSG_CHECKING([whether to enable requestAnimationFrame support])
892AC_ARG_ENABLE(request_animation_frame,
893 AC_HELP_STRING([--enable-request-animation-frame],
894 [enable support for requestAnimationFrame (experimental) [default=no]]),
895 [],[enable_request_animation_frame="no"])
896AC_MSG_RESULT([$enable_request_animation_frame])
897
915# check whether to enable touch icon loading 898# check whether to enable touch icon loading
916AC_MSG_CHECKING([whether to enable touch icon loading]) 899AC_MSG_CHECKING([whether to enable touch icon loading])
917AC_ARG_ENABLE(touch_icon_loading, 900AC_ARG_ENABLE(touch_icon_loading,
@@ -1029,10 +1012,7 @@ fi
1029AC_SUBST([SQLITE3_CFLAGS]) 1012AC_SUBST([SQLITE3_CFLAGS])
1030AC_SUBST([SQLITE3_LIBS]) 1013AC_SUBST([SQLITE3_LIBS])
1031 1014
1032if (test "$sqlite3_found" = "no") && (test "$enable_icon_database" = "yes" || \ 1015if (test "$sqlite3_found" = "no"); then
1033 test "$enable_database" = "yes" || \
1034 test "$enable_offline_web_applications" = "yes" || \
1035 test "$enable_dom_storage" = "yes"); then
1036 AC_MSG_ERROR([SQLite3 is required for the Database related features]) 1016 AC_MSG_ERROR([SQLite3 is required for the Database related features])
1037fi 1017fi
1038 1018
@@ -1059,10 +1039,11 @@ if test "$os_win32" = "no"; then
1059fi 1039fi
1060 1040
1061# check if gstreamer is available 1041# check if gstreamer is available
1062if test "$enable_video" = "yes"; then 1042if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
1063 PKG_CHECK_MODULES([GSTREAMER], 1043 PKG_CHECK_MODULES([GSTREAMER],
1064 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION 1044 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
1065 gstreamer-app-0.10 1045 gstreamer-app-0.10
1046 gstreamer-audio-0.10
1066 gstreamer-base-0.10 1047 gstreamer-base-0.10
1067 gstreamer-interfaces-0.10 1048 gstreamer-interfaces-0.10
1068 gstreamer-pbutils-0.10 1049 gstreamer-pbutils-0.10
@@ -1074,6 +1055,17 @@ if test "$enable_video" = "yes"; then
1074 AC_SUBST([GSTREAMER_LIBS]) 1055 AC_SUBST([GSTREAMER_LIBS])
1075fi 1056fi
1076 1057
1058# check if libfftw is available
1059if test "$enable_web_audio" = "yes"; then
1060 PKG_CHECK_MODULES([LIBFFTW],
1061 [fftw3 >= $LIBFFTW_REQUIRED_VERSION
1062 fftw3f >= $LIBFFTW_REQUIRED_VERSION],
1063 [have_fftw=yes])
1064
1065 AC_SUBST([LIBFFTW_CFLAGS])
1066 AC_SUBST([LIBFFTW_LIBS])
1067fi
1068
1077# check for code coverage support 1069# check for code coverage support
1078if test "$enable_coverage" = "yes"; then 1070if test "$enable_coverage" = "yes"; then
1079 COVERAGE_CFLAGS="-MD" 1071 COVERAGE_CFLAGS="-MD"
@@ -1090,9 +1082,8 @@ fi
1090# WebKit2 1082# WebKit2
1091AC_MSG_CHECKING([whether to build Webkit2]) 1083AC_MSG_CHECKING([whether to build Webkit2])
1092AC_ARG_ENABLE(webkit2, 1084AC_ARG_ENABLE(webkit2,
1093 AC_HELP_STRING([--enable-webkit2], 1085 AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]),
1094 [build webkit2 [default=no]]), 1086 [], [enable_webkit2="no"])
1095 [], [enable_webkit2="no"])
1096AC_MSG_RESULT([$enable_webkit2]) 1087AC_MSG_RESULT([$enable_webkit2])
1097if test "$enable_webkit2" = "yes"; then 1088if test "$enable_webkit2" = "yes"; then
1098 if test "$GTK_API_VERSION" = "2.0"; then 1089 if test "$GTK_API_VERSION" = "2.0"; then
@@ -1103,14 +1094,21 @@ fi
1103# Plugin Process 1094# Plugin Process
1104AC_MSG_CHECKING([whether to build plugin process for WebKit2]) 1095AC_MSG_CHECKING([whether to build plugin process for WebKit2])
1105AC_ARG_ENABLE(plugin_process, 1096AC_ARG_ENABLE(plugin_process,
1106 AC_HELP_STRING([--enable-plugin-process], 1097 AC_HELP_STRING([--enable-plugin-process], [build plugin process for WebKit2 [default=yes]]),
1107 [build plugin process for WebKit2 [default=yes]]), 1098 [], [enable_plugin_process="yes"])
1108 [], [enable_plugin_process="no"]) 1099AC_MSG_RESULT([$enable_plugin_process])
1109# Build the plugin process only when building webkit2. 1100
1101# Build the plugin process only when building Webkit2.
1110if test "$enable_webkit2" = "no"; then 1102if test "$enable_webkit2" = "no"; then
1111 enable_plugin_process=no 1103 enable_plugin_process=no
1112fi 1104fi
1113AC_MSG_RESULT([$enable_plugin_process]) 1105
1106# Make sure we have GTK+ 2.x to build the plugin process.
1107if test "$enable_plugin_process" = "yes"; then
1108 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION gail >= $GAIL2_REQUIRED_VERSION)
1109fi
1110AC_SUBST(GTK2_CFLAGS)
1111AC_SUBST(GTK2_LIBS)
1114 1112
1115GTK_DOC_CHECK([1.10]) 1113GTK_DOC_CHECK([1.10])
1116 1114
@@ -1127,6 +1125,9 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
1127AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) 1125AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
1128AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) 1126AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
1129 1127
1128# JS engine conditionals
1129AM_CONDITIONAL([USE_JSC], [test "$with_jsengine" = "jsc"])
1130
1130# Unicode backend conditionals 1131# Unicode backend conditionals
1131AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"]) 1132AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
1132AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"]) 1133AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
@@ -1144,36 +1145,34 @@ AM_CONDITIONAL([ENABLE_3D_RENDERING],[test "$enable_3d_rendering" = "yes"])
1144AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"]) 1145AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
1145AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"]) 1146AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
1146AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"]) 1147AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
1148AM_CONDITIONAL([ENABLE_MICRODATA],[test "$enable_microdata" = "yes"])
1147AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api" = "yes"]) 1149AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api" = "yes"])
1148AM_CONDITIONAL([ENABLE_PROGRESS_TAG],[test "$enable_progress_tag" = "yes"]) 1150AM_CONDITIONAL([ENABLE_PROGRESS_TAG],[test "$enable_progress_tag" = "yes"])
1149AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) 1151AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
1150AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) 1152AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
1151AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) 1153AM_CONDITIONAL([ENABLE_GAMEPAD],[test "$enable_gamepad" = "yes"])
1152AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"]) 1154AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
1153AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"]) 1155AM_CONDITIONAL([ENABLE_DATAGRID],[test "$enable_datagrid" = "yes"])
1154AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"]) 1156AM_CONDITIONAL([ENABLE_DATA_TRANSFER_ITEMS],[test "$enable_data_transfer_items" = "yes"])
1155AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) 1157AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])
1156AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
1157AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) 1158AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
1158AM_CONDITIONAL([ENABLE_DETAILS],[test "$enable_details" = "yes"]) 1159AM_CONDITIONAL([ENABLE_DETAILS],[test "$enable_details" = "yes"])
1159AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
1160AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) 1160AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
1161AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"]) 1161AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"])
1162AM_CONDITIONAL([ENABLE_STYLE_SCOPED],[test "$enable_style_scoped" = "yes"])
1162AM_CONDITIONAL([ENABLE_QUOTA],[test "$enable_quota" = "yes"]) 1163AM_CONDITIONAL([ENABLE_QUOTA],[test "$enable_quota" = "yes"])
1163AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 1164AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
1164AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) 1165AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
1165AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) 1166AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
1166AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"]) 1167AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"])
1167AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) 1168AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
1168AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
1169AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
1170AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) 1169AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
1171AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) 1170AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
1172AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) 1171AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
1173AM_CONDITIONAL([ENABLE_CLIENT_BASED_GEOLOCATION], [test "$enable_client_based_geolocation" = "yes"])
1174AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) 1172AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
1175AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"]) 1173AM_CONDITIONAL([ENABLE_MHTML], [test "$enable_mhtml" = "yes"])
1176AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) 1174AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
1175AM_CONDITIONAL([ENABLE_MEDIA_SOURCE],[test "$enable_media_source" = "yes"])
1177AM_CONDITIONAL([ENABLE_MEDIA_STATISTICS],[test "$enable_media_statistics" = "yes"]) 1176AM_CONDITIONAL([ENABLE_MEDIA_STATISTICS],[test "$enable_media_statistics" = "yes"])
1178AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"]) 1177AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"])
1179AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"]) 1178AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"])
@@ -1181,14 +1180,9 @@ AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
1181AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) 1180AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
1182AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) 1181AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
1183AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) 1182AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
1184AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
1185AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) 1183AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
1186AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
1187AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
1188AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
1189AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) 1184AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
1190AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) 1185AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
1191AM_CONDITIONAL([ENABLE_WCSS],[test "$enable_wcss" = "yes"])
1192AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"]) 1186AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
1193AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"]) 1187AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
1194AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) 1188AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
@@ -1201,9 +1195,11 @@ AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
1201AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"]) 1195AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"])
1202AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"]) 1196AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"])
1203AM_CONDITIONAL([ENABLE_ANIMATION_API],[test "$enable_animation_api" = "yes"]) 1197AM_CONDITIONAL([ENABLE_ANIMATION_API],[test "$enable_animation_api" = "yes"])
1198AM_CONDITIONAL([ENABLE_REQUEST_ANIMATION_FRAME],[test "$enable_request_animation_frame" = "yes"])
1204AM_CONDITIONAL([ENABLE_TOUCH_ICON_LOADING],[test "$enable_touch_icon_loading" = "yes"]) 1199AM_CONDITIONAL([ENABLE_TOUCH_ICON_LOADING],[test "$enable_touch_icon_loading" = "yes"])
1205AM_CONDITIONAL([ENABLE_REGISTER_PROTOCOL_HANDLER],[test "$enable_register_protocol_handler" = "yes"]) 1200AM_CONDITIONAL([ENABLE_REGISTER_PROTOCOL_HANDLER],[test "$enable_register_protocol_handler" = "yes"])
1206AM_CONDITIONAL([ENABLE_DEVICE_ORIENTATION],[test "$enable_device_orientation" = "yes"]) 1201AM_CONDITIONAL([ENABLE_DEVICE_ORIENTATION],[test "$enable_device_orientation" = "yes"])
1202AM_CONDITIONAL([ENABLE_MUTATION_OBSERVERS],[test "$enable_mutation_observers" = "yes"])
1207 1203
1208# Gtk conditionals 1204# Gtk conditionals
1209AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) 1205AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -1215,22 +1211,21 @@ GNUmakefile
1215 1211
1216AC_CONFIG_FILES([ 1212AC_CONFIG_FILES([
1217Source/WebKit/gtk/webkit/webkitversion.h 1213Source/WebKit/gtk/webkit/webkitversion.h
1218Source/WebKit/gtk/docs/GNUmakefile
1219Source/WebKit/gtk/docs/version.xml
1220]) 1214])
1221 1215
1222AC_CONFIG_FILES([ 1216AC_CONFIG_FILES([
1223Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in 1217Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
1224Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in 1218Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
1225Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in 1219Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
1226Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in 1220Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
1227] 1221]
1228,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1222,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
1229) 1223)
1230 1224
1225
1231if test "$enable_webkit2" = "yes"; then 1226if test "$enable_webkit2" = "yes"; then
1232 AC_CONFIG_FILES([ 1227 AC_CONFIG_FILES([
1233 Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in 1228 Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
1234 ] 1229 ]
1235 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1230 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
1236 ) 1231 )
@@ -1250,33 +1245,36 @@ Build configuration:
1250 Unicode backend : $with_unicode_backend 1245 Unicode backend : $with_unicode_backend
1251 Font backend : $with_font_backend 1246 Font backend : $with_font_backend
1252 Optimized memory allocator : $enable_fast_malloc 1247 Optimized memory allocator : $enable_fast_malloc
1248 JavaScript Engine : $with_jsengine
1249
1253Features: 1250Features:
1254 3D Rendering : $enable_3d_rendering 1251 3D Rendering : $enable_3d_rendering
1255 WebGL : $enable_webgl 1252 WebGL : $enable_webgl
1256 Blob support : $enable_blob 1253 Blob support : $enable_blob
1254 DOM mutation observer support : $enable_mutation_observers
1257 DeviceOrientation support : $enable_device_orientation 1255 DeviceOrientation support : $enable_device_orientation
1258 Directory upload : $enable_directory_upload 1256 Directory upload : $enable_directory_upload
1259 Fast Mobile Scrolling : $enable_fast_mobile_scrolling 1257 Fast Mobile Scrolling : $enable_fast_mobile_scrolling
1260 JIT compilation : $enable_jit 1258 JIT compilation : $enable_jit
1261 Filters support : $enable_filters 1259 Filters support : $enable_filters
1262 Geolocation support : $enable_geolocation 1260 Geolocation support : $enable_geolocation
1263 Client-based geolocation support : $enable_client_based_geolocation
1264 JavaScript debugger/profiler support : $enable_javascript_debugger 1261 JavaScript debugger/profiler support : $enable_javascript_debugger
1262 Gamepad support : $enable_gamepad
1265 MathML support : $enable_mathml 1263 MathML support : $enable_mathml
1264 Media source : $enable_media_source
1266 Media statistics : $enable_media_statistics 1265 Media statistics : $enable_media_statistics
1267 HTML5 offline web applications support : $enable_offline_web_applications
1268 HTML5 channel messaging support : $enable_channel_messaging 1266 HTML5 channel messaging support : $enable_channel_messaging
1269 HTML5 meter element support : $enable_meter_tag 1267 HTML5 meter element support : $enable_meter_tag
1268 HTML5 microdata support : $enable_microdata
1270 Page Visibility API support : $enable_page_visibility_api 1269 Page Visibility API support : $enable_page_visibility_api
1271 HTML5 progress element support : $enable_progress_tag 1270 HTML5 progress element support : $enable_progress_tag
1272 HTML5 client-side session and persistent storage support : $enable_dom_storage 1271 HTML5 client-side session and persistent storage support : $enable_dom_storage
1273 HTML5 client-side database storage support : $enable_database 1272 SQL client-side database storage support : $enable_sql_database
1274 HTML5 datagrid support : $enable_datagrid 1273 HTML5 datagrid support : $enable_datagrid
1275 HTML5 data transfer items support : $enable_data_transfer_items 1274 HTML5 data transfer items support : $enable_data_transfer_items
1276 HTML5 FileSystem API support : $enable_file_system 1275 HTML5 FileSystem API support : $enable_file_system
1277 Quota API support : $enable_quota 1276 Quota API support : $enable_quota
1278 HTML5 sandboxed iframe support : $enable_sandbox 1277 HTML5 sandboxed iframe support : $enable_sandbox
1279 HTML5 server-sent events support : $enable_eventsource
1280 HTML5 video element support : $enable_video 1278 HTML5 video element support : $enable_video
1281 HTML5 track element support : $enable_video_track 1279 HTML5 track element support : $enable_video_track
1282 Fullscreen API support : $enable_fullscreen_api 1280 Fullscreen API support : $enable_fullscreen_api
@@ -1289,31 +1287,26 @@ Features:
1289 Color input support : $enable_input_color 1287 Color input support : $enable_input_color
1290 Speech input support : $enable_input_speech 1288 Speech input support : $enable_input_speech
1291 SVG support : $enable_svg 1289 SVG support : $enable_svg
1292 SVG animation support : $enable_svg_animation
1293 SVG fonts support : $enable_svg_fonts 1290 SVG fonts support : $enable_svg_fonts
1294 SVG foreign object support : $enable_svg_foreign_object
1295 SVG as image support : $enable_svg_as_image
1296 SVG use element support : $enable_svg_use
1297 WCSS support : $enable_wcss
1298 Web Audio support : $enable_web_audio 1291 Web Audio support : $enable_web_audio
1299 Web Sockets support : $enable_web_sockets 1292 Web Sockets support : $enable_web_sockets
1300 Web Timing support : $enable_web_timing 1293 Web Timing support : $enable_web_timing
1301 Web Workers support : $enable_workers 1294 Web Workers support : $enable_workers
1302 XHTML-MP support : $enable_xhtmlmp
1303 XPATH support : $enable_xpath
1304 XSLT support : $enable_xslt 1295 XSLT support : $enable_xslt
1305 Spellcheck support : $enable_spellcheck 1296 Spellcheck support : $enable_spellcheck
1306 Animation API : $enable_animation_api 1297 Animation API : $enable_animation_api
1298 RequestAnimationFrame support : $enable_request_animation_frame
1307 Touch Icon Loading support : $enable_touch_icon_loading 1299 Touch Icon Loading support : $enable_touch_icon_loading
1308 Register Protocol Handler support : $enable_register_protocol_handler 1300 Register Protocol Handler support : $enable_register_protocol_handler
1301 WebKit2 support : $enable_webkit2
1302 WebKit2 plugin process : $enable_plugin_process
1309 1303
1310GTK+ configuration: 1304GTK+ configuration:
1311 GTK+ version : $with_gtk 1305 GTK+ version : $with_gtk
1312 GDK target : $with_target 1306 GDK target : $with_target
1313 Hildon UI extensions : $with_hildon 1307 Hildon UI extensions : $with_hildon
1314 Introspection support : $enable_introspection 1308 Introspection support : $enable_introspection
1315 WebKit2 support : $enable_webkit2 1309 Generate documentation : $enable_gtk_doc
1316 WebKit2 plugin process : $enable_plugin_process
1317" 1310"
1318if test "$with_unicode_backend" = "glib"; then 1311if test "$with_unicode_backend" = "glib"; then
1319 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<" 1312 echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<"
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 92b2df1..9652953 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" 8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
9 9
10DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3" 10DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" 11DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
12 12
13SRCREV_FORMAT = "source" 13SRCREV_FORMAT = "source"
14 14
15SRCREV = "90727" 15SRCREV = "101488"
16PV = "1.5.1+svnr${SRCPV}" 16PV = "1.7.2+svnr${SRCPV}"
17PR = "r1" 17PR = "r0"
18 18
19SRC_URI = "\ 19SRC_URI = "\
20 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ 20 svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -40,6 +40,7 @@ EXTRA_OECONF = "\
40 --enable-fullscreen-api \ 40 --enable-fullscreen-api \
41 --enable-image-resizer \ 41 --enable-image-resizer \
42 --enable-link-prefetch \ 42 --enable-link-prefetch \
43 --with-gtk=2.0 \
43 UNICODE_CFLAGS=-D_REENTRANT \ 44 UNICODE_CFLAGS=-D_REENTRANT \
44 " 45 "
45 46