Title: [238999] releases/WebKitGTK/webkit-2.22
- Revision
- 238999
- Author
- [email protected]
- Date
- 2018-12-07 17:19:49 -0800 (Fri, 07 Dec 2018)
Log Message
Merge r238929 - [GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL
https://bugs.webkit.org/show_bug.cgi?id=191998
Patch by Carlos Eduardo Ramalho <[email protected]> on 2018-12-06
Reviewed by Philippe Normand.
Fix compilation with -DENABLE_VIDEO=ON and -DENABLE_OPENGL=OFF due to GStreamerGL.
.:
* Source/cmake/GStreamerDependencies.cmake: "DEFINED ENABLE_OPENGL" is always false because ENABLE_OPENGL
is not a CMake variable (WEBKIT_OPTION_DEFINE macro does not define ENABLE_OPENGL variable per se, but other
variables and appends it to a list).
* Source/cmake/OptionsGTK.cmake: GStreamerDefinitions.cmake was included twice by mistake. Second should be GStreamerDependencies.cmake.
Source/WebCore:
No new tests required. Only fixing the build with certain flags.
* Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
(WebCore::CanvasCaptureMediaStreamTrack::Source::canvasChanged): add required #if ENABLE(WEBGL).
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/ChangeLog (238998 => 238999)
--- releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:19:46 UTC (rev 238998)
+++ releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:19:49 UTC (rev 238999)
@@ -1,5 +1,19 @@
2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+ [GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL
+ https://bugs.webkit.org/show_bug.cgi?id=191998
+
+ Reviewed by Philippe Normand.
+
+ Fix compilation with -DENABLE_VIDEO=ON and -DENABLE_OPENGL=OFF due to GStreamerGL.
+
+ * Source/cmake/GStreamerDependencies.cmake: "DEFINED ENABLE_OPENGL" is always false because ENABLE_OPENGL
+ is not a CMake variable (WEBKIT_OPTION_DEFINE macro does not define ENABLE_OPENGL variable per se, but other
+ variables and appends it to a list).
+ * Source/cmake/OptionsGTK.cmake: GStreamerDefinitions.cmake was included twice by mistake. Second should be GStreamerDependencies.cmake.
+
+2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+
REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
https://bugs.webkit.org/show_bug.cgi?id=191997
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (238998 => 238999)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-12-08 01:19:46 UTC (rev 238998)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-12-08 01:19:49 UTC (rev 238999)
@@ -1,5 +1,19 @@
2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+ [GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL
+ https://bugs.webkit.org/show_bug.cgi?id=191998
+
+ Reviewed by Philippe Normand.
+
+ Fix compilation with -DENABLE_VIDEO=ON and -DENABLE_OPENGL=OFF due to GStreamerGL.
+
+ No new tests required. Only fixing the build with certain flags.
+
+ * Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
+ (WebCore::CanvasCaptureMediaStreamTrack::Source::canvasChanged): add required #if ENABLE(WEBGL).
+
+2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+
REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
https://bugs.webkit.org/show_bug.cgi?id=191997
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (238998 => 238999)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2018-12-08 01:19:46 UTC (rev 238998)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp 2018-12-08 01:19:49 UTC (rev 238999)
@@ -124,6 +124,7 @@
{
ASSERT_UNUSED(canvas, m_canvas == &canvas);
+#if ENABLE(WEBGL)
// FIXME: We need to preserve drawing buffer as we are currently grabbing frames asynchronously.
// We should instead add an anchor point for both 2d and 3d contexts where canvas will actually paint.
// And call canvas observers from that point.
@@ -134,6 +135,7 @@
context.setPreserveDrawingBuffer(true);
}
}
+#endif
// FIXME: We should try to generate the frame at the time the screen is being updated.
if (m_canvasChangedTimer.isActive())
Modified: releases/WebKitGTK/webkit-2.22/Source/cmake/GStreamerDependencies.cmake (238998 => 238999)
--- releases/WebKitGTK/webkit-2.22/Source/cmake/GStreamerDependencies.cmake 2018-12-08 01:19:46 UTC (rev 238998)
+++ releases/WebKitGTK/webkit-2.22/Source/cmake/GStreamerDependencies.cmake 2018-12-08 01:19:49 UTC (rev 238999)
@@ -1,4 +1,4 @@
-if (DEFINED ENABLE_OPENGL)
+if (PORT STREQUAL "GTK")
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
endif ()
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
Modified: releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake (238998 => 238999)
--- releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake 2018-12-08 01:19:46 UTC (rev 238998)
+++ releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake 2018-12-08 01:19:49 UTC (rev 238999)
@@ -147,7 +147,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
-include(GStreamerDefinitions)
+include(GStreamerDependencies)
# Finalize the value for all options. Do not attempt to use an option before
# this point, and do not attempt to change any option after this point.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
