diff options
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.20.1.bb | 1 |
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 @@ | |||
| 1 | From: Alberto Garcia <berto@igalia.com> | ||
| 2 | Subject: Disable USE_GSTREAMER_GL is the package is not found | ||
| 3 | Forwarded: no | ||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | |||
| 7 | Index: 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 | ||
| 25 | SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" | 26 | SRC_URI[md5sum] = "0cd9b9ae1f48c04de5314f77806eceb4" |
