NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/webkitgtk: remove upstreamed patch

Browse Source 
The bump of webkitgtk to 2.24.3 in commit
3ff05d9094 forgot to drop a patch that
was upstreamed, and is now part of 2.24.3, causing a build failure, so
let's drop this patch.

Fixes:

  http://autobuild.buildroot.net/results/4d7bffd20344f06ca719b7c8083b81053b255aa5/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit d069301d63)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2019-08-01 16:44:34 +02:00 committed by Peter Korsgaard
parent 9be0bf7c97
commit 996994f8f2
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/webkitgtk/0001-Build-failure-after-r243644-in-GTK-Li.patch
View File

@ -1,36 +0,0 @@
From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001
From: "aperez@igalia.com"
<aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 20 May 2019 21:20:02 +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 <psaavedra@igalia.com> on 2019-04-01
Reviewed by Philippe Normand.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
index 608aee2e1b3..c614050972a 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.21.0