webkitgtk: fix opengl PACKAGECONFIG

Submitted by Martin Jansa on Nov. 6, 2020, 2:42 a.m. | Patch ID: 177908

Details

Message ID 20201106024252.112148-1-Martin.Jansa@gmail.com
State New
Headers show

Commit Message

Martin Jansa Nov. 6, 2020, 2:42 a.m.
* ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in r254064:
  https://github.com/WebKit/webkit/commit/92f9916b4a0d799c3f7be10b69aa53f40a149a2d
  and
  https://github.com/WebKit/webkit/commit/b3cb3ba4fa713e23ae27b2a79c14c6735d40d671
  but AUH doesn't notice that and builds without opengl in DISTRO_FEATURES are now
  failing with:
  | CMake Error at Source/cmake/OptionsGTK.cmake:323 (message):
  |   Either OpenGL or OpenGLES2 is needed for ENABLE_GRAPHICS_CONTEXT_GL.
  | Call Stack (most recent call first):
  |   Source/cmake/WebKitCommon.cmake:58 (include)
  |   CMakeLists.txt:173 (include)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

---
 meta/recipes-sato/webkit/webkitgtk_2.30.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144297): https://lists.openembedded.org/g/openembedded-core/message/144297
Mute This Topic: https://lists.openembedded.org/mt/78066677/1003190
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
index 1acba6be1d..56cd1eb9d4 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
@@ -48,7 +48,7 @@  PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geocl
 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_OPENGL=ON,-DENABLE_OPENGL=OFF,virtual/libgl"
+PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl"
 PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret"
 PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"