diff options
Diffstat (limited to 'poky/meta/recipes-sato')
| -rw-r--r-- | poky/meta/recipes-sato/l3afpad/l3afpad_git.bb | 4 | ||||
| -rw-r--r-- | poky/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb (renamed from poky/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb) | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb index b06b0958a0..56cbe6bc8d 100644 --- a/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb @@ -5,8 +5,8 @@ are implemented in the editor. L3afpad is simple to use, is easily compiled, \ requires few libraries, and starts up quickly." HOMEPAGE = "https://github.com/stevenhoneyman/l3afpad" -# Note that COPYING seems to mistakenly contain LGPLv2.1. -# The source code is marked GPLv2+ and COPYING used to contain +# Note that COPYING seems to mistakenly contain LGPL-2.1. +# The source code is marked GPL-2.0-or-later and COPYING used to contain # that as well. LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb index 9f5846858f..6870eed525 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.34.6.bb @@ -19,7 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reproducibility.patch \ " -SRC_URI[sha256sum] = "68930643af7a47a3af05f46d66e784422433753dab335d3282f319a85a5629b4" +SRC_URI[sha256sum] = "6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc @@ -60,8 +60,8 @@ PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/lib PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" -PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" @@ -98,6 +98,9 @@ EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " CFLAGS:append:arc = " -mlong-calls" CXXFLAGS:append:arc = " -mlong-calls" +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + # Javascript JIT is not supported on powerpc EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " |