diff --git a/webkit2gtk3-bug196440-build-fix.patch b/webkit2gtk3-bug196440-build-fix.patch new file mode 100644 index 0000000..af118ac --- /dev/null +++ b/webkit2gtk3-bug196440-build-fix.patch @@ -0,0 +1,40 @@ +From e2dd6decbe25ea9498f1ba213808f34b232740c7 Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" + +Date: Mon, 1 Apr 2019 09:47:08 +0000 +Subject: [PATCH] Build failure after r243644 in GTK Linux 64-bit stable builds + https://bugs.webkit.org/show_bug.cgi?id=196440 + +Patch by Pablo Saavedra on 2019-04-01 +Reviewed by Philippe Normand. + +* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: +(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@243690 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebCore/ChangeLog | 10 ++++++++++ + .../graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp | 2 ++ + 2 files changed, 12 insertions(+) + +diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +index 00a2af6489e..5cb5f7536ac 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp ++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags() + break; + } + ++#if USE(GSTREAMER_GL) + // When the imxvpudecoder is used, the texture sampling of the + // directviv-uploaded texture returns an RGB value, so there's no need to + // convert it. + if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU) + m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG; ++#endif + } + #endif + +-- +2.16.4 + diff --git a/webkit2gtk3-bug198080-build-fix.patch b/webkit2gtk3-bug198080-build-fix.patch new file mode 100644 index 0000000..d0bd244 --- /dev/null +++ b/webkit2gtk3-bug198080-build-fix.patch @@ -0,0 +1,59 @@ +diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +index 205ee4bd296..51089792283 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp ++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +@@ -66,24 +66,6 @@ + + #include + +-#if USE(LIBEPOXY) +-// Include the header before . +-#include +- +-// Workaround build issue with RPi userland GLESv2 headers and libepoxy +-#if !GST_CHECK_VERSION(1, 14, 0) +-#include +-#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX +-#define __gl2_h_ +-#undef GST_GL_HAVE_GLSYNC +-#define GST_GL_HAVE_GLSYNC 1 +-#endif +-#endif // !GST_CHECK_VERSION(1, 14, 0) +-#endif // USE(LIBEPOXY) +- +-#define GST_USE_UNSTABLE_API +-#include +-#undef GST_USE_UNSTABLE_API + + #include "GLContext.h" + #if USE(GLX) +diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h +index 59afdfcc01b..980ea1986c4 100644 +--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h ++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h +@@ -37,6 +37,25 @@ + #include + #include + ++#if USE(LIBEPOXY) ++// Include the header before . ++#include ++ ++// Workaround build issue with RPi userland GLESv2 headers and libepoxy ++#if !GST_CHECK_VERSION(1, 14, 0) ++#include ++#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX ++#define __gl2_h_ ++#undef GST_GL_HAVE_GLSYNC ++#define GST_GL_HAVE_GLSYNC 1 ++#endif ++#endif // !GST_CHECK_VERSION(1, 14, 0) ++#endif // USE(LIBEPOXY) ++ ++#define GST_USE_UNSTABLE_API ++#include ++#undef GST_USE_UNSTABLE_API ++ + #if USE(TEXTURE_MAPPER_GL) + #include "TextureMapperGL.h" + #if USE(NICOSIA) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 729bab0..0746ce8 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Sat Jun 22 18:34:57 UTC 2019 - mgorse@suse.com + +- Add webkit2gtk3-bug196440-build-fix.patch and + webkit2gtk3-bug198080-build-fix.patch: fix build failures on + SLE/Leap 15 and SLE 12. + ------------------------------------------------------------------- Fri May 24 08:00:33 UTC 2019 - Bjørn Lie -- Update to version 2.24.2: +- Update to version 2.24.2 (boo#1135715): + Fix rendering of emojis copy-pasted from GTK emoji chooser. + Fix space characters not being rendered with some CJK fonts. + Fix adaptive streaming playback with older GStreamer versions. diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 851f645..21a6f35 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -54,6 +54,10 @@ 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 webkit2gtk3-bug196440-build-fix.patch mgorse@suse.com -- fix a build failure. +Patch2: webkit2gtk3-bug196440-build-fix.patch +# PATCh-FIX-UPSTREAM webkit2gtk3-bug198080-build-fix.patch mgorse@suse.com -- fix build with gstreamer 1.12.x. +Patch3: webkit2gtk3-bug198080-build-fix.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLESv1_CM-devel @@ -290,6 +294,8 @@ A small test browswer from webkit, useful for testing features. %prep %setup -q -n webkitgtk-%{version} %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %define _lto_cflags %{nil}