[Buildroot] [git commit master] webkit: remove user visible rendering target selection

[Buildroot] [git commit master] webkit: remove user visible rendering target selection

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=0f4d293c30d45cb86e06216da2a9bdf55c9d9b01
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
---
 package/webkit/Config.in |   19 -------------------
 package/webkit/webkit.mk |   11 +++++++----
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index eee6bcb..b0d69d7 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -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
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 2121f4b..39debd3 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -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
-- 
1.6.3.3

[Buildroot] [git commit master] webkit: remove user visible rendering target selection

[Thomas Petazzoni]

On Wed, 26 May 2010 14:14:39 +0200
Peter Korsgaard <jacmet@sunsite.dk> wrote:

> +ifeq ($(BR2_PACKAGE_XORG7),y)
> +	WEBKIT_CONF_OPT += --with-target=x11
> +	WEBKIT_DEPENDENCIES += xserver_xorg-server
>  endif

Technically speaking, I don't think any X11 client applications
requires the server. Instead, it probably requires xlib_libX11 and
maybe some other additional libraries.

But, I admit that this isn't handled properly in all packages, and as
soon as one wants a X11 application, one probably also want the X
server as well, in most situations.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [git commit master] webkit: remove user visible rendering target selection

[Yann E. MORIN]

Hello All!

On Wednesday 26 May 2010 15:22:52 Thomas Petazzoni wrote:
> Technically speaking, I don't think any X11 client applications
> requires the server. Instead, it probably requires xlib_libX11 and
> maybe some other additional libraries.

Yes, I do agree. I can think of at least one headless box that I run
X11 applications on, via an 'ssh -X'.

> But, I admit that this isn't handled properly in all packages, and as
> soon as one wants a X11 application, one probably also want the X
> server as well, in most situations.

I'm afraid that 201005 wil have to live with that, and people that are
interested (like I am) in a configuration for headless+X11 contribute
the necessary changes for a future release.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [git commit master] webkit: remove user visible rendering target selection

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> On Wed, 26 May 2010 14:14:39 +0200
 Thomas> Peter Korsgaard <jacmet@sunsite.dk> wrote:

 >> +ifeq ($(BR2_PACKAGE_XORG7),y)
 >> +	WEBKIT_CONF_OPT += --with-target=x11
 >> +	WEBKIT_DEPENDENCIES += xserver_xorg-server
 >> endif

 Thomas> Technically speaking, I don't think any X11 client applications
 Thomas> requires the server. Instead, it probably requires xlib_libX11 and
 Thomas> maybe some other additional libraries.

True, but currently we have this client == server relationship in BR for
the X11 stuff.

 Thomas> But, I admit that this isn't handled properly in all packages, and as
 Thomas> soon as one wants a X11 application, one probably also want the X
 Thomas> server as well, in most situations.

Normally yes, but this is something we could (should?) cleanup long term
imho.

-- 
Bye, Peter Korsgaard