Title: [220007] trunk
- Revision
- 220007
- Author
- [email protected]
- Date
- 2017-07-28 11:06:59 -0700 (Fri, 28 Jul 2017)
Log Message
[GTK] Building with ENABLE_VIDEO=OFF fails
https://bugs.webkit.org/show_bug.cgi?id=174940
Reviewed by Alex Christensen.
.:
Code guarded by ENABLE(MEDIA_STREAM) requires the definition of HTMLVideoElement to
be available, which in turn is guarded by ENABLE(VIDEO).
* Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_STREAM depend on ENABLE_VIDEO.
Tools:
When GStreamer usage is completely disabled at build time, CMake does not query pkg-config for the GStreamer.
This adds missing USE(GSTREAMER) guards in order to make testing code buildable when GStreamer usage is disabled.
* TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp:
(methodCallCallback): Add missing USE(GSTREAMER) guard.
Modified Paths
Diff
Modified: trunk/ChangeLog (220006 => 220007)
--- trunk/ChangeLog 2017-07-28 17:29:12 UTC (rev 220006)
+++ trunk/ChangeLog 2017-07-28 18:06:59 UTC (rev 220007)
@@ -1,3 +1,15 @@
+2017-07-28 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Building with ENABLE_VIDEO=OFF fails
+ https://bugs.webkit.org/show_bug.cgi?id=174940
+
+ Reviewed by Alex Christensen.
+
+ Code guarded by ENABLE(MEDIA_STREAM) requires the definition of HTMLVideoElement to
+ be available, which in turn is guarded by ENABLE(VIDEO).
+
+ * Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_STREAM depend on ENABLE_VIDEO.
+
2017-07-28 Claudio Saavedra <[email protected]>
[WPE] Implement EventSenderProxy in WTR
Modified: trunk/Source/cmake/WebKitFeatures.cmake (220006 => 220007)
--- trunk/Source/cmake/WebKitFeatures.cmake 2017-07-28 17:29:12 UTC (rev 220006)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2017-07-28 18:06:59 UTC (rev 220007)
@@ -202,6 +202,7 @@
WEBKIT_OPTION_DEPEND(ENABLE_INDEXED_DATABASE_IN_WORKERS ENABLE_INDEXED_DATABASE)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE ENABLE_VIDEO)
+ WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_STREAM ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_VIDEO_TRACK ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_TOUCH_SLIDER ENABLE_TOUCH_EVENTS)
endmacro()
Modified: trunk/Tools/ChangeLog (220006 => 220007)
--- trunk/Tools/ChangeLog 2017-07-28 17:29:12 UTC (rev 220006)
+++ trunk/Tools/ChangeLog 2017-07-28 18:06:59 UTC (rev 220007)
@@ -1,3 +1,16 @@
+2017-07-28 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Building with ENABLE_VIDEO=OFF fails
+ https://bugs.webkit.org/show_bug.cgi?id=174940
+
+ Reviewed by Alex Christensen.
+
+ When GStreamer usage is completely disabled at build time, CMake does not query pkg-config for the GStreamer.
+ This adds missing USE(GSTREAMER) guards in order to make testing code buildable when GStreamer usage is disabled.
+
+ * TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp:
+ (methodCallCallback): Add missing USE(GSTREAMER) guard.
+
2017-07-28 Claudio Saavedra <[email protected]>
[WPE] Implement EventSenderProxy in WTR
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp (220006 => 220007)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp 2017-07-28 17:29:12 UTC (rev 220006)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp 2017-07-28 18:06:59 UTC (rev 220007)
@@ -22,7 +22,9 @@
#include <_javascript_Core/JSContextRef.h>
#include <_javascript_Core/JSRetainPtr.h>
#include <gio/gio.h>
+#if USE(GSTREAMER)
#include <gst/gst.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <wtf/Deque.h>
@@ -396,6 +398,7 @@
g_dbus_method_invocation_return_value(invocation,
g_variant_new("(u)", static_cast<guint32>(getCurrentProcessID())));
} else if (!g_strcmp0(methodName, "RemoveAVPluginsFromGSTRegistry")) {
+#if USE(GSTREAMER)
gst_init(nullptr, nullptr);
static const char* avPlugins[] = { "libav", "omx", "vaapi", nullptr };
GstRegistry* registry = gst_registry_get();
@@ -405,6 +408,7 @@
gst_object_unref(plugin);
}
}
+#endif
g_dbus_method_invocation_return_value(invocation, nullptr);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
