From c76f1fe05661bcdff1b59694cba986bc5feaf1c8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Apr 2018 07:06:46 -0700 Subject: webkitgtk: Disable using GST_GL if gst does not enable it Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- .../webkit/webkitgtk/detect-gstreamer-gl.patch | 20 ++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.20.1.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch (limited to 'meta/recipes-sato/webkit') diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch new file mode 100644 index 0000000000..57ae48c141 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch @@ -0,0 +1,20 @@ +From: Alberto Garcia +Subject: Disable USE_GSTREAMER_GL is the package is not found +Forwarded: no +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: webkitgtk/Source/cmake/GStreamerChecks.cmake +=================================================================== +--- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake ++++ webkitgtk/Source/cmake/GStreamerChecks.cmake +@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) + message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.") + else () + if (NOT PC_GSTREAMER_GL_FOUND) +- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.") ++ set(USE_GSTREAMER_GL OFF) ++ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.") + endif () + endif () + endif () diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb index 1e5def090c..360ab8e69b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.20.1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://detect-atomics-during-configure.patch \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ + file://detect-gstreamer-gl.patch \ " SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" -- cgit 1.2.3-korg