summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-30 07:06:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:00:28 +0100
commitc76f1fe05661bcdff1b59694cba986bc5feaf1c8 (patch)
treeeeba56c013f77d78132239f8d7e73d74776c9dc9 /meta/recipes-sato
parente0fff928df0e82cd2c4729771b9e7c73dd79685b (diff)
downloadopenembedded-core-c76f1fe05661bcdff1b59694cba986bc5feaf1c8.tar.gz
openembedded-core-c76f1fe05661bcdff1b59694cba986bc5feaf1c8.tar.bz2
openembedded-core-c76f1fe05661bcdff1b59694cba986bc5feaf1c8.zip
webkitgtk: Disable using GST_GL if gst does not enable it
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch20
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.20.1.bb1
2 files changed, 21 insertions, 0 deletions
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 <berto@igalia.com>
+Subject: Disable USE_GSTREAMER_GL is the package is not found
+Forwarded: no
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+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"