summaryrefslogtreecommitdiffstats
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:56:49 +0100
commit8cc24f35950287ca3031666fe6a2e24b84179b84 (patch)
tree0c4fac89bf9eceb7b5c0e47b12ac33ffc7bd7338
parent198fbe90bf2876b0c939c3e2057c2e33a011a883 (diff)
downloadpoky-8cc24f35950287ca3031666fe6a2e24b84179b84.tar.gz
webkitgtk: Disable using GST_GL if gst does not enable it
(From OE-Core rev: c76f1fe05661bcdff1b59694cba986bc5feaf1c8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1From: Alberto Garcia <berto@igalia.com>
2Subject: Disable USE_GSTREAMER_GL is the package is not found
3Forwarded: no
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
8===================================================================
9--- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
10+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
11@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
12 message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
13 else ()
14 if (NOT PC_GSTREAMER_GL_FOUND)
15- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
16+ set(USE_GSTREAMER_GL OFF)
17+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
18 endif ()
19 endif ()
20 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 \
20 file://detect-atomics-during-configure.patch \ 20 file://detect-atomics-during-configure.patch \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \ 22 file://0001-Fix-build-with-musl.patch \
23 file://detect-gstreamer-gl.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" 26SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4"