gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

webkit: remove user visible rendering target selection

Browse Source 
Instead use the same logic as in libgtk2. The rendering target selected
MUST be the same as libgtk2's, so just figure it out automatically
instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-05-25 23:25:37 +02:00
parent 4059a814bb
commit 0f4d293c30
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/webkit/Config.in
View File

@ -21,22 +21,3 @@ config BR2_PACKAGE_WEBKIT
comment "webkit requires a toolchain with C++ support and WCHAR enabled"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
if BR2_PACKAGE_WEBKIT
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
endif

11
package/webkit/webkit.mk
View File

@ -14,12 +14,15 @@ WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \
libgtk2 sqlite enchant libsoup
ifeq ($(BR2_PACKAGE_WEBKIT_X11),y)
WEBKIT_CONF_OPT = --with-target=x11
ifeq ($(BR2_PACKAGE_XORG7),y)
WEBKIT_CONF_OPT += --with-target=x11
WEBKIT_DEPENDENCIES += xserver_xorg-server
endif
ifeq ($(BR2_PACKAGE_WEBKIT_DIRECTFB),y)
WEBKIT_CONF_OPT = --with-target=directfb
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
WEBKIT_CONF_OPT += --with-target=directfb
WEBKIT_DEPENDENCIES += directfb
endif
WEBKIT_CONF_OPT += --disable-video