Changeset 238929 in webkit

Timestamp:

Dec 6, 2018 5:07:46 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[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 <​cadubentzen@gmail.com> 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).

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (modified) (2 diffs)
• Source/cmake/GStreamerDependencies.cmake (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2018-12-06  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [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  <cadubentzen@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-06  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [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  <cadubentzen@gmail.com>
 

trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp

@@ -144 +144 @@
     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.
@@ -154 +155 @@
         }
     }
+#endif
 
     // FIXME: We should try to generate the frame at the time the screen is being updated.

trunk/Source/cmake/GStreamerDependencies.cmake

@@ -1 @@
-if (DEFINED ENABLE_OPENGL)
+if (PORT STREQUAL "GTK")
   WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
 endif ()

trunk/Source/cmake/OptionsGTK.cmake

@@ -151 +151 @@
 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