Attachment 294843 Details for Bug 164776 – patch

[patch] patch

patch.patch (text/plain), 2.10 KB, created by Philippe Normand on 2016-11-15 09:26:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2016-11-15 09:26:27 PST

Size: 2.10 KB

patch

obsolete

>From c42ee93756d07320f77af5303eff923ba80f4263 Mon Sep 17 00:00:00 2001
>From: Philippe Normand <pnormand@igalia.com>
>Date: Tue, 15 Nov 2016 18:25:59 +0100
>Subject: [PATCH] patch
>
>---
> Source/WebCore/ChangeLog                                     | 12 ++++++++++++
> .../graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp   |  4 ++++
> 2 files changed, 16 insertions(+)
>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fe5b153..daa15d4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2016-11-15  Philippe Normand  <pnormand@igalia.com>
>+
>+        [GStreamer][GL] build broken when using gst-plugins-bad from git
>+        https://bugs.webkit.org/show_bug.cgi?id=164776
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::requestGLContext): The
>+        GStreamer GL context GType was renamed, add an ifder taking this
>+        into account.
>+
> 2016-11-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [MultiCol] Render tree should be all clean by the end of FrameView::layout().
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 9920f94..969369a 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -307,7 +307,11 @@ GstContext* MediaPlayerPrivateGStreamerBase::requestGLContext(const gchar* conte
>     if (!g_strcmp0(contextType, "gst.gl.app_context")) {
>         GstContext* appContext = gst_context_new("gst.gl.app_context", TRUE);
>         GstStructure* structure = gst_context_writable_structure(appContext);
>+#if GST_CHECK_VERSION(1, 11, 0)
>+        gst_structure_set(structure, "context", GST_TYPE_GL_CONTEXT, player->gstGLContext(), nullptr);
>+#else
>         gst_structure_set(structure, "context", GST_GL_TYPE_CONTEXT, player->gstGLContext(), nullptr);
>+#endif
>         return appContext;
>     }
> 
>-- 
>2.10.2

Flags:

calvaris: review+
calvaris: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 164776: 294843