Title: [161310] trunk
- Revision
- 161310
- Author
- [email protected]
- Date
- 2014-01-04 09:44:28 -0800 (Sat, 04 Jan 2014)
Log Message
[GTK] [CMake] Fix the video and audio build
https://bugs.webkit.org/show_bug.cgi?id=126464
Reviewed by Philippe Normand.
.:
* Source/cmake/OptionsGTK.cmake: GStreamer files look for USE(GSTREAMER) and USE(WEBAUDIO_GSTREAMER),
so define those when appropriate. Web audio is one by default in autotools, so turn it on for cmake
as well.
Source/WebCore:
* PlatformGTK.cmake: Complete the audio and video source lists.
Tools:
* GtkLauncher/CMakeLists.txt: Add GStreamer includes and libraries, since GtkLauncher uses it.
Modified Paths
Diff
Modified: trunk/ChangeLog (161309 => 161310)
--- trunk/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
@@ -1,3 +1,14 @@
+2014-01-04 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Fix the video and audio build
+ https://bugs.webkit.org/show_bug.cgi?id=126464
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsGTK.cmake: GStreamer files look for USE(GSTREAMER) and USE(WEBAUDIO_GSTREAMER),
+ so define those when appropriate. Web audio is one by default in autotools, so turn it on for cmake
+ as well.
+
2014-01-03 Martin Robinson <[email protected]>
[CMake] The forwarding headers generated by WebKitMacros.m4 are incompatible with the headers generated by generate-forwarding-headers.pl
Modified: trunk/Source/WebCore/ChangeLog (161309 => 161310)
--- trunk/Source/WebCore/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/Source/WebCore/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
@@ -1,3 +1,12 @@
+2014-01-04 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Fix the video and audio build
+ https://bugs.webkit.org/show_bug.cgi?id=126464
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Complete the audio and video source lists.
+
2014-01-04 Zan Dobersek <[email protected]>
Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
Modified: trunk/Source/WebCore/PlatformGTK.cmake (161309 => 161310)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
@@ -67,10 +67,21 @@
platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
platform/graphics/freetype/SimpleFontDataFreeType.cpp
+ platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp
platform/graphics/gstreamer/GRefPtrGStreamer.cpp
platform/graphics/gstreamer/GStreamerUtilities.cpp
platform/graphics/gstreamer/ImageGStreamerCairo.cpp
+ platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp
+ platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+ platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+ platform/graphics/gstreamer/MediaSourceGStreamer.cpp
+ platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp
+ platform/graphics/gstreamer/TextCombinerGStreamer.cpp
+ platform/graphics/gstreamer/TextSinkGStreamer.cpp
+ platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp
platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+ platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp
+ platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp
platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
platform/graphics/harfbuzz/HarfBuzzFace.cpp
@@ -155,9 +166,6 @@
platform/graphics/glx/GLContextGLX.cpp
- platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
- platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
-
platform/graphics/gtk/ColorGtk.cpp
platform/graphics/gtk/GdkCairoUtilities.cpp
platform/graphics/gtk/IconGtk.cpp
Modified: trunk/Source/cmake/OptionsGTK.cmake (161309 => 161310)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
@@ -66,7 +66,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
@@ -133,6 +133,14 @@
add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=537)
add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=30)
+if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
+ add_definitions(-DWTF_USE_GSTREAMER)
+endif ()
+
+if (ENABLE_WEB_AUDIO)
+ add_definitions(-DWTF_USE_WEBAUDIO_GSTREAMER)
+endif ()
+
# FIXME: These need to be configurable.
add_definitions(-DWTF_PLATFORM_X11=1)
add_definitions(-DMOZ_X11)
Modified: trunk/Tools/ChangeLog (161309 => 161310)
--- trunk/Tools/ChangeLog 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/Tools/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
@@ -1,3 +1,12 @@
+2014-01-04 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Fix the video and audio build
+ https://bugs.webkit.org/show_bug.cgi?id=126464
+
+ Reviewed by Philippe Normand.
+
+ * GtkLauncher/CMakeLists.txt: Add GStreamer includes and libraries, since GtkLauncher uses it.
+
2014-01-03 Alexey Proskuryakov <[email protected]>
It's confusing to have two elements link to the same URL at build.webkit.org/dashboard
Modified: trunk/Tools/GtkLauncher/CMakeLists.txt (161309 => 161310)
--- trunk/Tools/GtkLauncher/CMakeLists.txt 2014-01-04 17:26:52 UTC (rev 161309)
+++ trunk/Tools/GtkLauncher/CMakeLists.txt 2014-01-04 17:44:28 UTC (rev 161310)
@@ -8,6 +8,7 @@
${DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_WEBKITGTK_DIR}
${GLIB_INCLUDE_DIRS}
+ ${GSTREAMER_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
@@ -22,6 +23,7 @@
${_javascript_Core_LIBRARY_NAME}
WebKit
${GLIB_LIBRARIES}
+ ${GSTREAMER_LIBRARIES}
${GTK3_LIBRARIES}
${LIBSOUP_LIBRARIES}
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
