pool/webkit2gtk3
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 688929 from home:mgorse:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Bjørn Lie 2019-03-28 10:39:26 +00:00 committed by Git OBS Bridge
parent df9382e73a
commit 611955fd59
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webkit2gtk3.changes
View File

@ -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

3
webkit2gtk3.spec
View File

@ -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

29
webkitgtk-gstreamer-gl-build-fix.patch Normal file
View File

@ -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<GLuint*>(m_videoFrame.data[0]);
} else
+#else
+ UNUSED_PARAM(gstGLEnabled);
+ UNUSED_PARAM(flags);
#endif // USE(GSTREAMER_GL)
{