Title: [181527] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 181527
- Author
- carlo...@webkit.org
- Date
- 2015-03-16 01:16:23 -0700 (Mon, 16 Mar 2015)
Log Message
Merge r181385 - [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
https://bugs.webkit.org/show_bug.cgi?id=142577
Reviewed by Carlos Garcia Campos.
No new tests, this is a build fix.
* PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
* PlatformGTK.cmake: Idem.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181526 => 181527)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 07:21:45 UTC (rev 181526)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 08:16:23 UTC (rev 181527)
@@ -1,3 +1,15 @@
+2015-03-11 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
+ https://bugs.webkit.org/show_bug.cgi?id=142577
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests, this is a build fix.
+
+ * PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
+ * PlatformGTK.cmake: Idem.
+
2015-03-10 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] GL_MAX_VARYING_FLOATS is not defined in OpenGL ES 2
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformEfl.cmake (181526 => 181527)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformEfl.cmake 2015-03-16 07:21:45 UTC (rev 181526)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformEfl.cmake 2015-03-16 08:16:23 UTC (rev 181527)
@@ -347,6 +347,7 @@
${GSTREAMER_BASE_LIBRARIES}
${GSTREAMER_LIBRARIES}
${GSTREAMER_PBUTILS_LIBRARIES}
+ ${GSTREAMER_AUDIO_LIBRARIES}
)
# Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
set_source_files_properties(platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp PROPERTIES COMPILE_DEFINITIONS "GLIB_DISABLE_DEPRECATION_WARNINGS=1")
@@ -428,7 +429,6 @@
${GSTREAMER_FFT_INCLUDE_DIRS}
)
list(APPEND WebCore_LIBRARIES
- ${GSTREAMER_AUDIO_LIBRARIES}
${GSTREAMER_FFT_LIBRARIES}
)
set(WEB_AUDIO_DIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/webaudio/resources)
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake (181526 => 181527)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake 2015-03-16 07:21:45 UTC (rev 181526)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake 2015-03-16 08:16:23 UTC (rev 181527)
@@ -321,6 +321,7 @@
${GSTREAMER_BASE_LIBRARIES}
${GSTREAMER_LIBRARIES}
${GSTREAMER_PBUTILS_LIBRARIES}
+ ${GSTREAMER_AUDIO_LIBRARIES}
)
# Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
set_source_files_properties(platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp PROPERTIES COMPILE_DEFINITIONS "GLIB_DISABLE_DEPRECATION_WARNINGS=1")
@@ -354,7 +355,6 @@
${GSTREAMER_FFT_INCLUDE_DIRS}
)
list(APPEND WebCore_LIBRARIES
- ${GSTREAMER_AUDIO_LIBRARIES}
${GSTREAMER_FFT_LIBRARIES}
)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
