diff options
author | leot <leot@pkgsrc.org> | 2019-05-20 11:15:48 +0000 |
---|---|---|
committer | leot <leot@pkgsrc.org> | 2019-05-20 11:15:48 +0000 |
commit | b289b86633d533fb6d15887a27dd30e5ae6de8f4 (patch) | |
tree | a1b6f18d2d08b3ebe9ffb586d7f31204f37e7748 /www | |
parent | a33ec9a69ee8a2f7e6e1ed5e28da08816a8a77aa (diff) | |
download | pkgsrc-b289b86633d533fb6d15887a27dd30e5ae6de8f4.tar.gz |
webkit-gtk: Fix the build with `opengl' option
TEXTURE_MAPPER_COLOR_CONVERT_FLAG is defined only if GSTREAMER_GL
is defined (it is not in pkgsrc package). Backport a patch from
upstream to address that.
Thanks to <wiz> for reporting this problem!
Diffstat (limited to 'www')
-rw-r--r-- | www/webkit-gtk/distinfo | 3 | ||||
-rw-r--r-- | www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index ee50a6318e2..6a3eb63a017 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.122 2019/05/17 17:57:44 leot Exp $ +$NetBSD: distinfo,v 1.123 2019/05/20 11:15:48 leot Exp $ SHA1 (webkitgtk-2.24.2.tar.xz) = 632a65d93beb996bebdf7592ef9591f3993dea91 RMD160 (webkitgtk-2.24.2.tar.xz) = 067a23d186b0c363c53a2a05ec7bcb1e8da483e7 @@ -23,6 +23,7 @@ SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 740eb33931b6f9 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9 SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp) = 38c24500c7619d290b22efd730eb36086e32461f +SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp) = a82885add0e9c70b14b598b4ad967277ebb96942 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 8c19692e78b1cfb021b95435508a10bc6542b173 diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp new file mode 100644 index 00000000000..6ab5b34492c --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp,v 1.1 2019/05/20 11:15:48 leot Exp $ + +Backport upstream changeset 243690 to fix the build when GSTREAMER_GL +is not used, via: + + <https://trac.webkit.org/changeset/243690/webkit> + +--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2019-05-09 09:32:33.000000000 +0000 ++++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::up + 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 + |