Title: [267942] releases/WebKitGTK/webkit-2.30
- Revision
- 267942
- Author
- [email protected]
- Date
- 2020-10-04 04:37:43 -0700 (Sun, 04 Oct 2020)
Log Message
Merge r267882 - [GTK] Build broken with ENABLE_MEDIA_STREAM enabled and ENABLE_WEB_RTC_DISABLED
https://bugs.webkit.org/show_bug.cgi?id=217128
Reviewed by Philippe Normand.
.:
* Source/cmake/GStreamerChecks.cmake: Only enable USE_LIBWEBRTC when both
ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC is defined. This prevents trying to
build code that uses libwebrtc types when ENABLE_WEB_RTC is disabled but
ENABLE_MEDIA_STREAM is enabled.
Source/WebCore:
No new tests needed.
* platform/mediastream/gstreamer/GStreamerAudioData.h: Remove USE(LIBWEBRTC) guard, as
there is nothing specific to WebRTC in this file, and it is needed when building with
ENABLE_MEDIA_STREAM enabled.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.30/ChangeLog (267941 => 267942)
--- releases/WebKitGTK/webkit-2.30/ChangeLog 2020-10-04 08:16:33 UTC (rev 267941)
+++ releases/WebKitGTK/webkit-2.30/ChangeLog 2020-10-04 11:37:43 UTC (rev 267942)
@@ -1,3 +1,15 @@
+2020-10-02 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Build broken with ENABLE_MEDIA_STREAM enabled and ENABLE_WEB_RTC_DISABLED
+ https://bugs.webkit.org/show_bug.cgi?id=217128
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/GStreamerChecks.cmake: Only enable USE_LIBWEBRTC when both
+ ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC is defined. This prevents trying to
+ build code that uses libwebrtc types when ENABLE_WEB_RTC is disabled but
+ ENABLE_MEDIA_STREAM is enabled.
+
2020-09-21 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.30.1 release
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog (267941 => 267942)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-10-04 08:16:33 UTC (rev 267941)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog 2020-10-04 11:37:43 UTC (rev 267942)
@@ -1,3 +1,16 @@
+2020-10-02 Adrian Perez de Castro <[email protected]>
+
+ [GTK] Build broken with ENABLE_MEDIA_STREAM enabled and ENABLE_WEB_RTC_DISABLED
+ https://bugs.webkit.org/show_bug.cgi?id=217128
+
+ Reviewed by Philippe Normand.
+
+ No new tests needed.
+
+ * platform/mediastream/gstreamer/GStreamerAudioData.h: Remove USE(LIBWEBRTC) guard, as
+ there is nothing specific to WebRTC in this file, and it is needed when building with
+ ENABLE_MEDIA_STREAM enabled.
+
2020-09-26 Carlos Garcia Campos <[email protected]>
[SOUP] Do not set site for cookies twice in case of redirection
Modified: releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioData.h (267941 => 267942)
--- releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioData.h 2020-10-04 08:16:33 UTC (rev 267941)
+++ releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioData.h 2020-10-04 11:37:43 UTC (rev 267942)
@@ -21,7 +21,7 @@
#pragma once
-#if ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
#include "GRefPtrGStreamer.h"
#include "PlatformAudioData.h"
@@ -56,4 +56,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM) && USE(LIBWEBRTC) && USE(GSTREAMER)
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER)
Modified: releases/WebKitGTK/webkit-2.30/Source/cmake/GStreamerChecks.cmake (267941 => 267942)
--- releases/WebKitGTK/webkit-2.30/Source/cmake/GStreamerChecks.cmake 2020-10-04 08:16:33 UTC (rev 267941)
+++ releases/WebKitGTK/webkit-2.30/Source/cmake/GStreamerChecks.cmake 2020-10-04 11:37:43 UTC (rev 267942)
@@ -50,7 +50,7 @@
message(FATAL_ERROR "GStreamer 1.14 is needed for ENABLE_MEDIA_SOURCE.")
endif ()
-if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
+if (ENABLE_MEDIA_STREAM AND ENABLE_WEB_RTC)
if (PC_GSTREAMER_VERSION VERSION_LESS "1.12")
message(FATAL_ERROR "GStreamer 1.12 is needed for ENABLE_WEB_RTC.")
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
