Title: [116468] trunk
- Revision
- 116468
- Author
- [email protected]
- Date
- 2012-05-08 17:02:30 -0700 (Tue, 08 May 2012)
Log Message
[CMake] FindGStreamer: Fix the build with static WebCore.
https://bugs.webkit.org/show_bug.cgi?id=85930
Reviewed by Daniel Bates.
.:
Building WebCore statically was failing because files in
WebCore/platform/gstreamer when ENABLE_VIDEO was set required
gstreamer-base, which was not being linked to after r116453.
Fix that by looking for gstreamer-base, requiring and linking
against it if GStreamer is used.
* Source/cmake/FindGStreamer.cmake:
Source/WebCore:
No new tests, build fix.
Building WebCore statically was failing because files in
WebCore/platform/gstreamer when ENABLE_VIDEO was set required
gstreamer-base, which was not being linked to after r116453.
Fix that by looking for gstreamer-base, requiring and linking
against it if GStreamer is used.
* PlatformEfl.cmake: Link to GSTREAMER_LIBRARIES and
GSTREAMER_BASE_LIBRARIES, and include GSTREAMER_INCLUDE_DIRS and
GSTREAMER_BASE_INCLUDE_DIRS.
Modified Paths
Diff
Modified: trunk/ChangeLog (116467 => 116468)
--- trunk/ChangeLog 2012-05-08 23:55:49 UTC (rev 116467)
+++ trunk/ChangeLog 2012-05-09 00:02:30 UTC (rev 116468)
@@ -1,5 +1,21 @@
2012-05-08 Raphael Kubo da Costa <[email protected]>
+ [CMake] FindGStreamer: Fix the build with static WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=85930
+
+ Reviewed by Daniel Bates.
+
+ Building WebCore statically was failing because files in
+ WebCore/platform/gstreamer when ENABLE_VIDEO was set required
+ gstreamer-base, which was not being linked to after r116453.
+
+ Fix that by looking for gstreamer-base, requiring and linking
+ against it if GStreamer is used.
+
+ * Source/cmake/FindGStreamer.cmake:
+
+2012-05-08 Raphael Kubo da Costa <[email protected]>
+
[CMake] Rewrite FindGStreamer.cmake.
https://bugs.webkit.org/show_bug.cgi?id=85857
Modified: trunk/Source/WebCore/ChangeLog (116467 => 116468)
--- trunk/Source/WebCore/ChangeLog 2012-05-08 23:55:49 UTC (rev 116467)
+++ trunk/Source/WebCore/ChangeLog 2012-05-09 00:02:30 UTC (rev 116468)
@@ -1,3 +1,23 @@
+2012-05-08 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] FindGStreamer: Fix the build with static WebCore.
+ https://bugs.webkit.org/show_bug.cgi?id=85930
+
+ Reviewed by Daniel Bates.
+
+ No new tests, build fix.
+
+ Building WebCore statically was failing because files in
+ WebCore/platform/gstreamer when ENABLE_VIDEO was set required
+ gstreamer-base, which was not being linked to after r116453.
+
+ Fix that by looking for gstreamer-base, requiring and linking
+ against it if GStreamer is used.
+
+ * PlatformEfl.cmake: Link to GSTREAMER_LIBRARIES and
+ GSTREAMER_BASE_LIBRARIES, and include GSTREAMER_INCLUDE_DIRS and
+ GSTREAMER_BASE_INCLUDE_DIRS.
+
2012-05-08 Raymond Toy <[email protected]>
_javascript_AudioNode should not ASSERT if number of input channels is 0
Modified: trunk/Source/WebCore/PlatformEfl.cmake (116467 => 116468)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-05-08 23:55:49 UTC (rev 116467)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-05-09 00:02:30 UTC (rev 116468)
@@ -219,6 +219,8 @@
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/gstreamer"
+ ${GSTREAMER_INCLUDE_DIRS}
+ ${GSTREAMER_BASE_INCLUDE_DIRS}
${GSTREAMER_APP_INCLUDE_DIRS}
${GSTREAMER_INTERFACES_INCLUDE_DIRS}
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
@@ -229,6 +231,8 @@
platform/graphics/gstreamer/GStreamerVersioning.cpp
)
LIST(APPEND WebCore_LIBRARIES
+ ${GSTREAMER_LIBRARIES}
+ ${GSTREAMER_BASE_LIBRARIES}
${GSTREAMER_APP_LIBRARIES}
${GSTREAMER_INTERFACES_LIBRARIES}
${GSTREAMER_PBUTILS_LIBRARIES}
Modified: trunk/Source/cmake/FindGStreamer.cmake (116467 => 116468)
--- trunk/Source/cmake/FindGStreamer.cmake 2012-05-08 23:55:49 UTC (rev 116467)
+++ trunk/Source/cmake/FindGStreamer.cmake 2012-05-09 00:02:30 UTC (rev 116468)
@@ -5,6 +5,12 @@
# GSTREAMER_INCLUDE_DIRS - the GStreamer include directories
# GSTREAMER_LIBRARIES - link these to use GStreamer
#
+# Additionally, gstreamer-base is always looked for and required, and
+# the following related variables are defined:
+#
+# GSTREAMER_BASE_INCLUDE_DIRS - gstreamer-base's include directory
+# GSTREAMER_BASE_LIBRARIES - link to these to use gstreamer-base
+#
# Optionally, the COMPONENTS keyword can be passed to FIND_PACKAGE()
# and GStreamer plugins can be looked for. Currently, the following
# plugins can be searched, and they define the following variables if
@@ -72,6 +78,7 @@
# 1.1. Find headers and libraries
FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-0.10 gst/gst.h gstreamer-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-0.10 gst/gst.h gstbase-0.10)
# 1.2. Check GStreamer version
IF (GSTREAMER_INCLUDE_DIRS)
@@ -112,7 +119,7 @@
# ------------------------------------------------
# 3. Process the COMPONENTS passed to FIND_PACKAGE
# ------------------------------------------------
-SET(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK)
+SET(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
FOREACH(_component ${GStreamer_FIND_COMPONENTS})
SET(_gst_component "GSTREAMER_${_component}")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
