diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:14:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 20:14:23 +0200 |
| commit | 30484be05d9e318e89e12f40a55c65766cec700a (patch) | |
| tree | aeae7e586fd5d790fd51728912a9c76a1cd0ddb1 /gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch | |
| parent | b8d41cfc875b1a6c438ac138fdce9caa579b8486 (diff) | |
| parent | 2e03bbeb7be35faa1cb5b41c119d378d221266f3 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch')
| -rw-r--r-- | gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch b/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch deleted file mode 100644 index 4577c81edb..0000000000 --- a/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build failure when USE_GSTREAMER_GL=off. See -<https://bugs.webkit.org/show_bug.cgi?id=196440>. - -This patch is taken from the upstream source repository: -<https://git.webkit.org/?p=WebKit.git;a=commitdiff;h=e2dd6decbe25ea9498f1ba213808f34b232740c7>. - -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 - |