diff options
| author | Marius Bakke | 2019-05-24 22:44:51 +0200 |
|---|---|---|
| committer | Marius Bakke | 2019-05-24 22:44:51 +0200 |
| commit | ddb4062784c66ecc0c42910b209dc80356a197ea (patch) | |
| tree | d61154cfe888201707c2b4708bd6297ac371f0b0 /gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch | |
| parent | 563ecba5cf1dac64818fa7c452fcb191ec28e0fd (diff) | |
| parent | dbe533292b2af2faad371c10bc9b3f03193f94b7 (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, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch b/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch new file mode 100644 index 000000000..4577c81ed --- /dev/null +++ b/gnu/packages/patches/webkitgtk-sans-gstreamer-gl.patch @@ -0,0 +1,24 @@ +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 + |