Attachment 345948 Details for Bug 188010 – Patch

[patch] Patch

bug-188010-20180727163825.patch (text/plain), 6.98 KB, created by Thibault Saunier on 2018-07-27 13:38:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-07-27 13:38:26 PDT

Size: 6.98 KB

patch

obsolete

>Subversion Revision: 234321
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 81736d8728bdeed2516020bde36855ba706e6de0..69ea7613b366c85e4779236a1d905dc2e98676a6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-07-25  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GStreamer] Make codecparsers optionnal
>+        https://bugs.webkit.org/show_bug.cgi?id=188010
>+
>+        And avoid building libWebRTC if it won't be used. While there is no other
>+        WebRTC backend, it makes no sense to expose an option.
>+
>+        Error out when WEBRTC or MEDIA_STREAM is enabled but GStreamer < 1.10
>+
>+        * platform/GStreamer.cmake:
>+
> 2018-07-27  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WIN] Crash when trying to access store pages
>diff --git a/Source/WebCore/platform/GStreamer.cmake b/Source/WebCore/platform/GStreamer.cmake
>index 8ede1758ccb391f0c803fa9089d99ff8171344f9..ff0599f036434b0a0da720a2e034c4fb269cca20 100644
>--- a/Source/WebCore/platform/GStreamer.cmake
>+++ b/Source/WebCore/platform/GStreamer.cmake
>@@ -60,7 +60,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
>         ${GSTREAMER_BASE_INCLUDE_DIRS}
>         ${GSTREAMER_APP_INCLUDE_DIRS}
>         ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
>-        ${GSTREAMER_CODECPARSERS_INCLUDE_DIRS}
>     )
> 
>     list(APPEND WebCore_LIBRARIES
>@@ -69,7 +68,6 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
>         ${GSTREAMER_LIBRARIES}
>         ${GSTREAMER_PBUTILS_LIBRARIES}
>         ${GSTREAMER_AUDIO_LIBRARIES}
>-        ${GSTREAMER_CODECPARSERS_LIBRARIES}
>     )
> 
>     # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
>@@ -108,13 +106,17 @@ if (ENABLE_VIDEO)
>         )
>     endif ()
> 
>-    if (USE_LIBWEBRTC)
>-        list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>-            ${GSTREAMER_CODECPARSERS_INCLUDE_DIRS}
>-        )
>-        list(APPEND WebCore_LIBRARIES
>-            ${GSTREAMER_CODECPARSERS_LIBRARIES}
>-        )
>+    if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
>+        if (PC_GSTREAMER_VERSION VERSION_LESS "1.10")
>+            message(FATAL_ERROR "GStreamer 1.10 is needed for ENABLE_MEDIA_STREAM or ENABLE_WEB_RTC")
>+        else ()
>+            list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
>+                ${GSTREAMER_CODECPARSERS_INCLUDE_DIRS}
>+            )
>+            list(APPEND WebCore_LIBRARIES
>+                ${GSTREAMER_CODECPARSERS_LIBRARIES}
>+            )
>+        endif ()
>     endif ()
> endif ()
> 
>diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
>index 0d63ea6fe97458330ebc494695fbd813159e76de..69164bb14247974c51ec96aaffaa95596ee69e0b 100644
>--- a/Source/cmake/GStreamerChecks.cmake
>+++ b/Source/cmake/GStreamerChecks.cmake
>@@ -44,3 +44,16 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
> 
>     SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
> endif ()
>+
>+if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
>+    if (PC_GSTREAMER_VERSION VERSION_LESS "1.10")
>+        SET_AND_EXPOSE_TO_BUILD(USE_LIBWEBRTC FALSE)
>+        SET_AND_EXPOSE_TO_BUILD(WEBRTC_WEBKIT_BUILD FALSE)
>+    else ()
>+        SET_AND_EXPOSE_TO_BUILD(USE_LIBWEBRTC TRUE)
>+        SET_AND_EXPOSE_TO_BUILD(WEBRTC_WEBKIT_BUILD TRUE)
>+    endif ()
>+else ()
>+    SET_AND_EXPOSE_TO_BUILD(USE_LIBWEBRTC FALSE)
>+    SET_AND_EXPOSE_TO_BUILD(WEBRTC_WEBKIT_BUILD FALSE)
>+endif ()
>\ No newline at end of file
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 8f8912e93045e1c78e5682a4f2efff221dd59e74..945dedec22eff04197728abd5a6e501a950d507f 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -89,7 +89,6 @@ WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts."
> # completely unsupported. They are intended for use only by WebKit developers.
> WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
> WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>-WEBKIT_OPTION_DEFINE(USE_LIBWEBRTC "Whether to use libwebrtc for WebRTC support" PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
> 
> # FIXME: Can we use cairo-glesv2 to avoid this conflict?
> WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
>@@ -102,8 +101,6 @@ WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
> WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL)
> WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_X11_TARGET)
> 
>-WEBKIT_OPTION_DEPEND(USE_LIBWEBRTC ENABLE_WEB_RTC)
>-
> SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
> if (DEVELOPER_MODE)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
>@@ -225,12 +222,6 @@ if (ENABLE_INTROSPECTION)
>     endif ()
> endif ()
> 
>-if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
>-    set(USE_LIBWEBRTC TRUE)
>-    SET_AND_EXPOSE_TO_BUILD(USE_LIBWEBRTC TRUE)
>-    SET_AND_EXPOSE_TO_BUILD(WEBRTC_WEBKIT_BUILD TRUE)
>-endif ()
>-
> if (ENABLE_SUBTLE_CRYPTO)
>     find_package(Libtasn1 REQUIRED)
>     if (NOT LIBTASN1_FOUND)
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 8c7ad9c5d18de628e8c62313bb85b6cf1a6d8fbb..e87011d52d6e8c7c312ce7ec936ce7c2ad48970c 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -50,9 +50,6 @@ WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts."
> 
> # Private options specific to the WPE port.
> WEBKIT_OPTION_DEFINE(USE_OPENVR "Whether to use OpenVR as WebVR backend." PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>-WEBKIT_OPTION_DEFINE(USE_LIBWEBRTC "Whether to use libwebrtc for WebRTC support" PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>-
>-WEBKIT_OPTION_DEPEND(USE_LIBWEBRTC ENABLE_WEB_RTC)
> 
> if (CMAKE_SYSTEM_NAME MATCHES "Linux")
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
>@@ -115,12 +112,6 @@ if (ENABLE_XSLT)
>     find_package(LibXslt 1.1.7 REQUIRED)
> endif ()
> 
>-if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
>-    set(USE_LIBWEBRTC TRUE)
>-    SET_AND_EXPOSE_TO_BUILD(USE_LIBWEBRTC TRUE)
>-    SET_AND_EXPOSE_TO_BUILD(WEBRTC_WEBKIT_BUILD TRUE)
>-endif ()
>-
> add_definitions(-DBUILDING_WPE__=1)
> add_definitions(-DGETTEXT_PACKAGE="WPE")
> add_definitions(-DJSC_GLIB_API_ENABLED)
>diff --git a/ChangeLog b/ChangeLog
>index 71f30f610bf054efece62a10dfe100a4fdc65299..351390d03c321d3089e7ec54ce962854f738c0e6 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-07-25  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        [GStreamer] Make codecparsers optionnal
>+        https://bugs.webkit.org/show_bug.cgi?id=188010
>+
>+        And avoid building libWebRTC if it won't be used. While there is no other
>+        WebRTC backend, it makes no sense to expose an option.
>+
>+        Error out when WEBRTC or MEDIA_STREAM is enabled but GStreamer < 1.10
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/GStreamerChecks.cmake:
>+        * Source/cmake/OptionsGTK.cmake:
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2018-07-26  Andy VanWagoner  <andy@vanwagoner.family>
> 
>         [INTL] Remove INTL sub-feature compile flags

Actions: View | Formatted Diff | Diff

Attachments on bug 188010: 345766 | 345770 | 345948 | 345992 | 346058