[oe-commits] Peter Tworek : webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 9500ef3f5fae07c1592e8208bb306c1148e49418
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9500ef3f5fae07c1592e8208bb306c1148e49418

Author: Peter Tworek <tworaz666 at gmail.com>
Date:   Sat Feb  4 19:41:41 2012 +0100

webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.

* Add missing dependency on virtual/libgl.
* Make webgl configurable via DISTRO_FEATURES="opengl".
* Run tested on netbook pro.

Signed-off-by: Peter Tworek <tworaz666 at gmail.com>
Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>

---

 meta/recipes-sato/webkit/webkit-gtk_svn.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index d754a39..e279ca3 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -8,13 +8,14 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
 
 DEPENDS = "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"
+DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
 DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
 
 SRCREV_FORMAT = "source"
 
 SRCREV = "101488"
 PV = "1.7.2+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -41,6 +42,7 @@ EXTRA_OECONF = "\
                 --enable-image-resizer \
                 --enable-link-prefetch \
                 --with-gtk=2.0 \
+                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
                 UNICODE_CFLAGS=-D_REENTRANT \
                "