Title: [236191] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236191
- Author
- carlo...@webkit.org
- Date
- 2018-09-19 06:19:42 -0700 (Wed, 19 Sep 2018)
Log Message
Merge r235933 - Linking against libWPEWebKit-0.1.so is not posible when WPE is build with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
https://bugs.webkit.org/show_bug.cgi?id=189540
Patch by Pablo Saavedra <psaave...@igalia.com> on 2018-09-12
Reviewed by Philippe Normand.
Related issues:
This issue is related with changes in https://bugs.webkit.org/show_bug.cgi?id=183080
This issue is introduced in https://bugs.webkit.org/show_bug.cgi?id=186547
No new tests, no changes in the functionality.
* platform/GStreamer.cmake:
* platform/SourcesGLib.txt:
* platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp:
(WebCore::LibWebRTCProvider::webRTCAvailable):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236190 => 236191)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:19:37 UTC (rev 236190)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-19 13:19:42 UTC (rev 236191)
@@ -1,3 +1,22 @@
+2018-09-12 Pablo Saavedra <psaave...@igalia.com>
+
+ Linking against libWPEWebKit-0.1.so is not posible when WPE is build with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=189540
+
+ Reviewed by Philippe Normand.
+
+ Related issues:
+
+ This issue is related with changes in https://bugs.webkit.org/show_bug.cgi?id=183080
+ This issue is introduced in https://bugs.webkit.org/show_bug.cgi?id=186547
+
+ No new tests, no changes in the functionality.
+
+ * platform/GStreamer.cmake:
+ * platform/SourcesGLib.txt:
+ * platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp:
+ (WebCore::LibWebRTCProvider::webRTCAvailable):
+
2018-09-11 Zan Dobersek <zdober...@igalia.com>
Unreviewed WPE build fix.
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/GStreamer.cmake (236190 => 236191)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/GStreamer.cmake 2018-09-19 13:19:37 UTC (rev 236190)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/GStreamer.cmake 2018-09-19 13:19:42 UTC (rev 236191)
@@ -36,7 +36,6 @@
platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp
platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp
platform/mediastream/libwebrtc/LibWebRTCAudioModule.cpp
- platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
platform/mediastream/gstreamer/GStreamerAudioCaptureSource.cpp
platform/mediastream/gstreamer/GStreamerAudioCapturer.cpp
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/SourcesGLib.txt (236190 => 236191)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/SourcesGLib.txt 2018-09-19 13:19:37 UTC (rev 236190)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/SourcesGLib.txt 2018-09-19 13:19:42 UTC (rev 236191)
@@ -35,3 +35,5 @@
platform/glib/UserAgentGLib.cpp
platform/network/glib/NetworkStateNotifierGLib.cpp
+
+platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp (236190 => 236191)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp 2018-09-19 13:19:37 UTC (rev 236190)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp 2018-09-19 13:19:42 UTC (rev 236191)
@@ -41,7 +41,11 @@
bool LibWebRTCProvider::webRTCAvailable()
{
+#if USE(LIBWEBRTC) && USE(GSTREAMER)
return true;
+#else
+ return false;
+#endif
}
#if USE(LIBWEBRTC) && USE(GSTREAMER)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
