From 611955fd5925a10f3b4b3e242b0b80cd3137a44db646b71ec0511c64fa33f720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 28 Mar 2019 10:39:26 +0000 Subject: [PATCH] Accepting request 688929 from home:mgorse:branches:GNOME:Factory - Add webkitgtk-gstreamer-gl-build-fix.patch: fix build on SLE/Leap 15 (webkit#196178). OBS-URL: https://build.opensuse.org/request/show/688929 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=210 --- webkit2gtk3.changes | 6 ++++++ webkit2gtk3.spec | 3 +++ webkitgtk-gstreamer-gl-build-fix.patch | 29 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 webkitgtk-gstreamer-gl-build-fix.patch diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index efc3e56..2c50036 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 26 22:39:18 UTC 2019 - mgorse@suse.com + +- Add webkitgtk-gstreamer-gl-build-fix.patch: fix build on + SLE/Leap 15 (webkit#196178). + ------------------------------------------------------------------- Tue Mar 19 19:52:23 UTC 2019 - mgorse@suse.com diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 79e6110..945afcf 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -54,6 +54,8 @@ Source98: baselibs.conf Source99: webkit2gtk3.keyring # PATCH-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch +# PATCH-FIX-UPSTREAM webkitgtk-gstreamer-gl-build-fix.patch webkit#196178 mgorse@suse.com -- fix build on SLE/Leap 15. +Patch2: webkitgtk-gstreamer-gl-build-fix.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel @@ -291,6 +293,7 @@ A small test browswer from webkit, useful for testing features. %prep %setup -q -n webkitgtk-%{version} %patch1 -p1 +%patch2 -p1 %build # Here we must muzzle our dog so it doesn't eat all the memory diff --git a/webkitgtk-gstreamer-gl-build-fix.patch b/webkitgtk-gstreamer-gl-build-fix.patch new file mode 100644 index 0000000..8ef2de4 --- /dev/null +++ b/webkitgtk-gstreamer-gl-build-fix.patch @@ -0,0 +1,29 @@ +diff -urp webkitgtk-2.24.0.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp webkitgtk-2.24.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +--- webkitgtk-2.24.0.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-03-13 04:21:39.000000000 -0500 ++++ webkitgtk-2.24.0/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-03-26 17:38:02.621708276 -0500 +@@ -29,7 +29,6 @@ + + #include "GStreamerCommon.h" + #include "GraphicsContext.h" +-#include "GraphicsContext3D.h" + #include "ImageGStreamer.h" + #include "ImageOrientation.h" + #include "IntRect.h" +@@ -117,6 +116,7 @@ + #if USE(TEXTURE_MAPPER_GL) + #include "BitmapTextureGL.h" + #include "BitmapTexturePool.h" ++#include "GraphicsContext3D.h" + #include "TextureMapperContextAttributes.h" + #include "TextureMapperGL.h" + #include "TextureMapperPlatformLayerBuffer.h" +@@ -191,6 +191,9 @@ public: + if (m_isMapped) + m_textureID = *reinterpret_cast(m_videoFrame.data[0]); + } else ++#else ++ UNUSED_PARAM(gstGLEnabled); ++ UNUSED_PARAM(flags); + #endif // USE(GSTREAMER_GL) + + {