diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-10-10 15:16:48 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 12:47:35 +0100 |
| commit | 6562bd58055650d23a0cd66018b25be624ae99b9 (patch) | |
| tree | e4b85206fc395debd732ece07a94442f41c36144 | |
| parent | f997e13d0394ba358521d56f5888a11dae7267c0 (diff) | |
| download | poky-6562bd58055650d23a0cd66018b25be624ae99b9.tar.gz | |
webkitgtk/epiphany: add opengl to REQUIRED_DISTRO_FEATURES
They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]
Some sort of GL is needed yes. We indicate that with opengl loosely in OE
The epiphany depends on webkitgtk, add opengl to REQUIRED_DISTRO_FEATURES also.
(From OE-Core rev: 059af47ecd75d6b733ba893e000749bf3d89d413)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb index 8837b9c1d9..b46c9d3b46 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ | |||
| 8 | 8 | ||
| 9 | GNOMEBASEBUILDCLASS = "meson" | 9 | GNOMEBASEBUILDCLASS = "meson" |
| 10 | inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext | 10 | inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext |
| 11 | REQUIRED_DISTRO_FEATURES = "x11" | 11 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
| 12 | 12 | ||
| 13 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 13 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
| 14 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | 14 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ |
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb index c8d4f94f19..7f1ffcea45 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | |||
| @@ -30,8 +30,7 @@ SRC_URI[sha256sum] = "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac | |||
| 30 | 30 | ||
| 31 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc | 31 | inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
| 32 | 32 | ||
| 33 | # depends on libxt | 33 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
| 34 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 35 | 34 | ||
| 36 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ | 35 | DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \ |
| 37 | gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ | 36 | gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native sqlite3 \ |