Changeset 221009 in webkit


Ignore:
Timestamp:
Aug 22, 2017 2:54:16 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r221006.
​https://bugs.webkit.org/show_bug.cgi?id=175821

generates build failures in the bots (Requested by calvaris[m]
on #webkit).

Reverted changeset:

"[GStreamer][GTK][WPE] Move common things to GStreamer cmake
files"
​https://bugs.webkit.org/show_bug.cgi?id=175625
​http://trac.webkit.org/changeset/221006

Location:
trunk
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r221006 r221009  
     12017-08-22  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r221006.
     4        https://bugs.webkit.org/show_bug.cgi?id=175821
     5
     6        generates build failures in the bots (Requested by calvaris[m]
     7        on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[GStreamer][GTK][WPE] Move common things to GStreamer cmake
     12        files"
     13        https://bugs.webkit.org/show_bug.cgi?id=175625
     14        http://trac.webkit.org/changeset/221006
     15
    1162017-08-22  Xabier Rodriguez Calvar  <calvaris@igalia.com>
    217

  • trunk/Source/cmake/OptionsGTK.cmake

    r221006 r221009  
    5555WEBKIT_OPTION_BEGIN()
    5656
    57 include(GStreamerDefinitions)
    58 
    5957set(USE_CAIRO ON)
    6058set(USE_WOFF2 ON)
    … …  
    9795# Private options specific to the GTK+ port. Changing these options is
    9896# completely unsupported. They are intended for use only by WebKit developers.
     97WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)
     98WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
    9999WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
    100100
    … …  
    110110WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL)
    111111WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_X11_TARGET)
     112WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
     113WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
     114WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
    112115
    113116SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
    … …  
    142145WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
    143146WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
     147WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
     148WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)
    144149WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
    145150WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
    … …  
    167172WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
    168173WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PRIVATE ON)
     174WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE ON)
    169175WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON)
    170 
    171 include(GStreamerDefinitions)
    172176
    173177# Finalize the value for all options. Do not attempt to use an option before
    … …  
    320324        message(FATAL_ERROR "Enchant is needed for ENABLE_SPELLCHECK")
    321325    endif ()
     326endif ()
     327
     328if (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)
    322373endif ()
    323374
    … …  
    424475    endif ()
    425476endmacro()
    426 
    427 include(GStreamerChecks)

  • trunk/Source/cmake/OptionsWPE.cmake

    r221006 r221009  
    88
    99WEBKIT_OPTION_BEGIN()
    10 
    11 include(GStreamerDefinitions)
    1210
    1311# WebKit2 C API
    … …  
    3331WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
    3432WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
     33WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
     34WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)
    3535WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PRIVATE ON)
     36WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)
    3637WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
    3738
    … …  
    4243endif ()
    4344
    44 include(GStreamerDependencies)
     45WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
    4546
    4647WEBKIT_OPTION_END()
    … …  
    8283set(USE_XDGMIME ON)
    8384SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
     85
     86if (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?
     101endif ()
    84102
    85103if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
    … …  
    136154    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
    137155endif ()
    138 
    139 include(GStreamerChecks)
Note: See TracChangeset for help on using the changeset viewer.