diff options
author | Peter Tworek <tworaz666@gmail.com> | 2012-02-04 19:41:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:23 +0000 |
commit | e33f828d88fa650585723ef9b00d464d13e26554 (patch) | |
tree | a19f920f69f24846387e2670f1ca561cc03c95df /meta | |
parent | cc036d4c4e03bf01a014f5ad4db9176e7352edea (diff) | |
download | poky-e33f828d88fa650585723ef9b00d464d13e26554.tar.gz |
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.
(From OE-Core rev: 9500ef3f5fae07c1592e8208bb306c1148e49418)
Signed-off-by: Peter Tworek <tworaz666@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | 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 d754a39a91..e279ca3e9f 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 | |||
8 | file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" | 8 | file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" |
9 | 9 | ||
10 | 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" | 10 | 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" |
11 | DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" | ||
11 | DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" | 12 | DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" |
12 | 13 | ||
13 | SRCREV_FORMAT = "source" | 14 | SRCREV_FORMAT = "source" |
14 | 15 | ||
15 | SRCREV = "101488" | 16 | SRCREV = "101488" |
16 | PV = "1.7.2+svnr${SRCPV}" | 17 | PV = "1.7.2+svnr${SRCPV}" |
17 | PR = "r1" | 18 | PR = "r2" |
18 | 19 | ||
19 | SRC_URI = "\ | 20 | SRC_URI = "\ |
20 | svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ | 21 | svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ |
@@ -41,6 +42,7 @@ EXTRA_OECONF = "\ | |||
41 | --enable-image-resizer \ | 42 | --enable-image-resizer \ |
42 | --enable-link-prefetch \ | 43 | --enable-link-prefetch \ |
43 | --with-gtk=2.0 \ | 44 | --with-gtk=2.0 \ |
45 | ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ | ||
44 | UNICODE_CFLAGS=-D_REENTRANT \ | 46 | UNICODE_CFLAGS=-D_REENTRANT \ |
45 | " | 47 | " |
46 | 48 | ||