Linking against libWPEWebKit-0.1.so is not posible when WPE is build with ENABLE_VIDE...

https://bugs.webkit.org/show_bug.cgi?id=189540

Patch by Pablo Saavedra <psaavedra@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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e309fd3..eec833a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2018-09-12  Pablo Saavedra  <psaavedra@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  <zdobersek@igalia.com>
 
         Unreviewed WPE build fix.

diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
index ff0599f..d9a1fdb 100644 (file)
--- a/Source/WebCore/platform/GStreamer.cmake
+++ b/Source/WebCore/platform/GStreamer.cmake
@@ -36,7 +36,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
         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

diff --git a/Source/WebCore/platform/SourcesGLib.txt b/Source/WebCore/platform/SourcesGLib.txt
index 3a18ad4..8480191 100644 (file)
--- a/Source/WebCore/platform/SourcesGLib.txt
+++ b/Source/WebCore/platform/SourcesGLib.txt
@@ -35,3 +35,5 @@ platform/glib/SharedBufferGlib.cpp
 platform/glib/UserAgentGLib.cpp
 
 platform/network/glib/NetworkStateNotifierGLib.cpp
+
+platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp

diff --git a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
index db81d14..42514af 100644 (file)
--- a/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
+++ b/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGlib.cpp
@@ -41,7 +41,11 @@ UniqueRef<LibWebRTCProvider> LibWebRTCProvider::create()
 
 bool LibWebRTCProvider::webRTCAvailable()
 {
+#if USE(LIBWEBRTC) && USE(GSTREAMER)
     return true;
+#else
+    return false;
+#endif
 }
 
 #if USE(LIBWEBRTC) && USE(GSTREAMER)