Hello community, here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2019-06-24 21:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old) and /work/SRC/openSUSE:Factory/.webkit2gtk3.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkit2gtk3" Mon Jun 24 21:45:57 2019 rev:80 rq:711470 version:2.24.2 Changes: -------- --- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2019-05-27 08:29:58.723267605 +0200 +++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new.4615/webkit2gtk3.changes 2019-06-24 21:45:58.927764840 +0200 @@ -1,0 +2,7 @@ +Sat Jun 22 18:34:57 UTC 2019 - [email protected] + +- Add webkit2gtk3-bug196440-build-fix.patch and + webkit2gtk3-bug198080-build-fix.patch: fix build failures on + SLE/Leap 15 and SLE 12. + +------------------------------------------------------------------- @@ -4 +11 @@ -- Update to version 2.24.2: +- Update to version 2.24.2 (boo#1135715): New: ---- webkit2gtk3-bug196440-build-fix.patch webkit2gtk3-bug198080-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkit2gtk3.spec ++++++ --- /var/tmp/diff_new_pack.njW98e/_old 2019-06-24 21:46:01.431766730 +0200 +++ /var/tmp/diff_new_pack.njW98e/_new 2019-06-24 21:46:01.483766769 +0200 @@ -54,6 +54,10 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 [email protected] -- 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 [email protected] -- fix a build failure. +Patch2: webkit2gtk3-bug196440-build-fix.patch +# PATCh-FIX-UPSTREAM webkit2gtk3-bug198080-build-fix.patch [email protected] -- 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 @@ %prep %setup -q -n webkitgtk-%{version} %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %define _lto_cflags %{nil} ++++++ webkit2gtk3-bug196440-build-fix.patch ++++++ >From e2dd6decbe25ea9498f1ba213808f34b232740c7 Mon Sep 17 00:00:00 2001 From: "[email protected]" <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 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 <[email protected]> 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 ++++++ webkit2gtk3-bug198080-build-fix.patch ++++++ 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 <gst/app/gstappsink.h> -#if USE(LIBEPOXY) -// Include the <epoxy/gl.h> header before <gst/gl/gl.h>. -#include <epoxy/gl.h> - -// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639> -#if !GST_CHECK_VERSION(1, 14, 0) -#include <gst/gl/gstglconfig.h> -#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 <gst/gl/gl.h> -#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 <wtf/RunLoop.h> #include <wtf/WeakPtr.h> +#if USE(LIBEPOXY) +// Include the <epoxy/gl.h> header before <gst/gl/gl.h>. +#include <epoxy/gl.h> + +// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639> +#if !GST_CHECK_VERSION(1, 14, 0) +#include <gst/gl/gstglconfig.h> +#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 <gst/gl/gl.h> +#undef GST_USE_UNSTABLE_API + #if USE(TEXTURE_MAPPER_GL) #include "TextureMapperGL.h" #if USE(NICOSIA)
