Changeset 221006 in webkit
- Timestamp:
- Aug 22, 2017 1:44:36 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r220870 r221006 1 2017-08-22 Xabier Rodriguez Calvar <calvaris@igalia.com> 2 3 [GStreamer][GTK][WPE] Move common things to GStreamer cmake files 4 https://bugs.webkit.org/show_bug.cgi?id=175625 5 6 Three files were created as kind of hooks for the GTK and WPE 7 CMake option files. The definitions one is to enable, disable and 8 create the common options (that can be and are actually overriden 9 in some cases. The dependencies one adds dependencies for the 10 option switches that are set. The checks one ensure the 11 dependencies are met depending on the option switches. 12 13 Reviewed by Žan Doberšek. 14 15 * Source/cmake/GStreamerChecks.cmake: Added. 16 * Source/cmake/GStreamerDefinitions.cmake: Added. 17 * Source/cmake/GStreamerDependencies.cmake: Added. 18 * Source/cmake/OptionsGTK.cmake: 19 * Source/cmake/OptionsWPE.cmake: 20 1 21 2017-08-17 Andreas Kling <akling@apple.com> 2 22 -
trunk/Source/cmake/OptionsGTK.cmake
r220870 r221006 55 55 WEBKIT_OPTION_BEGIN() 56 56 57 include(GStreamerDefinitions) 58 57 59 set(USE_CAIRO ON) 58 60 set(USE_WOFF2 ON) … … 95 97 # Private options specific to the GTK+ port. Changing these options is 96 98 # completely unsupported. They are intended for use only by WebKit developers. 97 WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)98 WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)99 99 WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON) 100 100 … … 110 110 WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL) 111 111 WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_X11_TARGET) 112 WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)113 WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)114 WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)115 112 116 113 SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE}) … … 145 142 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) 146 143 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) 147 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)148 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)149 144 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON) 150 145 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF) … … 172 167 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON) 173 168 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PRIVATE ON) 174 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE ON)175 169 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON) 170 171 include(GStreamerDefinitions) 176 172 177 173 # Finalize the value for all options. Do not attempt to use an option before … … 324 320 message(FATAL_ERROR "Enchant is needed for ENABLE_SPELLCHECK") 325 321 endif () 326 endif ()327 328 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)329 set(GSTREAMER_COMPONENTS app pbutils)330 331 if (ENABLE_VIDEO)332 list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)333 endif ()334 335 if (ENABLE_WEB_AUDIO)336 list(APPEND GSTREAMER_COMPONENTS audio fft)337 endif ()338 339 find_package(GStreamer 1.2.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})340 341 if (ENABLE_WEB_AUDIO)342 if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)343 message(FATAL_ERROR "WebAudio requires the audio and fft GStreamer libraries. Please check your gst-plugins-base installation.")344 else ()345 SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)346 endif ()347 endif ()348 349 if (ENABLE_VIDEO)350 if (NOT PC_GSTREAMER_APP_FOUND OR NOT PC_GSTREAMER_PBUTILS_FOUND OR NOT PC_GSTREAMER_TAG_FOUND OR NOT PC_GSTREAMER_VIDEO_FOUND)351 message(FATAL_ERROR "Video playback requires the following GStreamer libraries: app, pbutils, tag, video. Please check your gst-plugins-base installation.")352 endif ()353 endif ()354 355 if (USE_GSTREAMER_MPEGTS)356 if (NOT PC_GSTREAMER_MPEGTS_FOUND)357 message(FATAL_ERROR "GStreamer MPEG-TS is needed for USE_GSTREAMER_MPEGTS.")358 endif ()359 endif ()360 361 if (USE_GSTREAMER_GL)362 if (PC_GSTREAMER_VERSION VERSION_LESS "1.10")363 set(USE_GSTREAMER_GL OFF)364 message(STATUS "Disabling GSTREAMER_GL as the GStreamer version is older than 1.10.")365 else ()366 if (NOT PC_GSTREAMER_GL_FOUND)367 message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")368 endif ()369 endif ()370 endif ()371 372 SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)373 322 endif () 374 323 … … 475 424 endif () 476 425 endmacro() 426 427 include(GStreamerChecks) -
trunk/Source/cmake/OptionsWPE.cmake
r220870 r221006 8 8 9 9 WEBKIT_OPTION_BEGIN() 10 11 include(GStreamerDefinitions) 10 12 11 13 # WebKit2 C API … … 31 33 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) 32 34 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON) 33 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)34 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)35 35 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PRIVATE ON) 36 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)37 36 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON) 38 37 … … 43 42 endif () 44 43 45 WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)44 include(GStreamerDependencies) 46 45 47 46 WEBKIT_OPTION_END() … … 83 82 set(USE_XDGMIME ON) 84 83 SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE) 85 86 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)87 set(GSTREAMER_COMPONENTS app audio pbutils)88 SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)89 if (ENABLE_VIDEO)90 list(APPEND GSTREAMER_COMPONENTS video tag)91 endif ()92 93 if (ENABLE_WEB_AUDIO)94 list(APPEND GSTREAMER_COMPONENTS fft)95 SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)96 endif ()97 98 find_package(GStreamer 1.2.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})99 100 # FIXME: What about MPEGTS support? USE_GSTREAMER_MPEGTS?101 endif ()102 84 103 85 if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC) … … 154 136 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden") 155 137 endif () 138 139 include(GStreamerChecks)
Note: See TracChangeset
for help on using the changeset viewer.