Changeset 116468 in webkit
- Timestamp:
- May 8, 2012 5:02:30 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r116453 r116468 1 2012-05-08 Raphael Kubo da Costa <rakuco@webkit.org> 2 3 [CMake] FindGStreamer: Fix the build with static WebCore. 4 https://bugs.webkit.org/show_bug.cgi?id=85930 5 6 Reviewed by Daniel Bates. 7 8 Building WebCore statically was failing because files in 9 WebCore/platform/gstreamer when ENABLE_VIDEO was set required 10 gstreamer-base, which was not being linked to after r116453. 11 12 Fix that by looking for gstreamer-base, requiring and linking 13 against it if GStreamer is used. 14 15 * Source/cmake/FindGStreamer.cmake: 16 1 17 2012-05-08 Raphael Kubo da Costa <rakuco@webkit.org> 2 18 -
trunk/Source/WebCore/ChangeLog
r116465 r116468 1 2012-05-08 Raphael Kubo da Costa <rakuco@webkit.org> 2 3 [CMake] FindGStreamer: Fix the build with static WebCore. 4 https://bugs.webkit.org/show_bug.cgi?id=85930 5 6 Reviewed by Daniel Bates. 7 8 No new tests, build fix. 9 10 Building WebCore statically was failing because files in 11 WebCore/platform/gstreamer when ENABLE_VIDEO was set required 12 gstreamer-base, which was not being linked to after r116453. 13 14 Fix that by looking for gstreamer-base, requiring and linking 15 against it if GStreamer is used. 16 17 * PlatformEfl.cmake: Link to GSTREAMER_LIBRARIES and 18 GSTREAMER_BASE_LIBRARIES, and include GSTREAMER_INCLUDE_DIRS and 19 GSTREAMER_BASE_INCLUDE_DIRS. 20 1 21 2012-05-08 Raymond Toy <rtoy@google.com> 2 22 -
trunk/Source/WebCore/PlatformEfl.cmake
r116453 r116468 220 220 "${WEBCORE_DIR}/platform/graphics/gstreamer" 221 221 222 ${GSTREAMER_INCLUDE_DIRS} 223 ${GSTREAMER_BASE_INCLUDE_DIRS} 222 224 ${GSTREAMER_APP_INCLUDE_DIRS} 223 225 ${GSTREAMER_INTERFACES_INCLUDE_DIRS} … … 230 232 ) 231 233 LIST(APPEND WebCore_LIBRARIES 234 ${GSTREAMER_LIBRARIES} 235 ${GSTREAMER_BASE_LIBRARIES} 232 236 ${GSTREAMER_APP_LIBRARIES} 233 237 ${GSTREAMER_INTERFACES_LIBRARIES} -
trunk/Source/cmake/FindGStreamer.cmake
r116453 r116468 5 5 # GSTREAMER_INCLUDE_DIRS - the GStreamer include directories 6 6 # GSTREAMER_LIBRARIES - link these to use GStreamer 7 # 8 # Additionally, gstreamer-base is always looked for and required, and 9 # the following related variables are defined: 10 # 11 # GSTREAMER_BASE_INCLUDE_DIRS - gstreamer-base's include directory 12 # GSTREAMER_BASE_LIBRARIES - link to these to use gstreamer-base 7 13 # 8 14 # Optionally, the COMPONENTS keyword can be passed to FIND_PACKAGE() … … 73 79 # 1.1. Find headers and libraries 74 80 FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-0.10 gst/gst.h gstreamer-0.10) 81 FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-0.10 gst/gst.h gstbase-0.10) 75 82 76 83 # 1.2. Check GStreamer version … … 113 120 # 3. Process the COMPONENTS passed to FIND_PACKAGE 114 121 # ------------------------------------------------ 115 SET(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK )122 SET(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES) 116 123 117 124 FOREACH(_component ${GStreamer_FIND_COMPONENTS})
Note: See TracChangeset
for help on using the changeset viewer.