Changeset 91752 in webkit


Ignore:
Timestamp:
Jul 26, 2011 6:34:26 AM (13 years ago)
Author:
abecsi@webkit.org
Message:

Patch by Alexis Menard <​alexis.menard@openbossa.org> on 2011-07-26
Reviewed by Andreas Kling.

[Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
​https://bugs.webkit.org/show_bug.cgi?id=63472

Source/JavaScriptCore:

Enable the bits needed for GStreamer only when QtMultimedia is not used.

  • wtf/wtf.pri:

Source/WebCore:

Enable the GStreamer backend and the QuickTime backend as default media players
for the Qt port on Mac and Linux. QtMultimedia is now a fallback option that you
can enable by passing DEFINES+=USE_QT_MULTIMEDIA=1 to enforce its usage.

No new tests. The media layout tests are disabled on the Qt port but hopefully with this
switch we can enable them again.

  • WebCore.pri:
  • WebCore.pro:
  • features.pri:

Source/WebKit/qt:

Use the flag WTF_USE_QTKIT=1 rather than USE_QTKIT=1 because that flag doesn't
exist anymore, it's the default. Ditto for GStreamer.

Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r91746 r91752  
     12011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
     6        https://bugs.webkit.org/show_bug.cgi?id=63472
     7
     8        Enable the bits needed for GStreamer only when QtMultimedia is not used.
     9
     10        * wtf/wtf.pri:
     11
    1122011-07-26  Shinya Kawanaka  <shinyak@google.com>
    213

  • trunk/Source/JavaScriptCore/wtf/wtf.pri

    r84911 r91752  
    4242    wtf/unicode/UTF8.cpp
    4343
    44 contains(DEFINES, USE_GSTREAMER=1) {
     44linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
    4545    DEFINES += ENABLE_GLIB_SUPPORT=1
    4646    PKGCONFIG += glib-2.0 gio-2.0

  • trunk/Source/WebCore/ChangeLog

    r91750 r91752  
     12011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
     6        https://bugs.webkit.org/show_bug.cgi?id=63472
     7
     8        Enable the GStreamer backend and the QuickTime backend as default media players
     9        for the Qt port on Mac and Linux. QtMultimedia is now a fallback option that you
     10        can enable by passing DEFINES+=USE_QT_MULTIMEDIA=1 to enforce its usage.
     11
     12        No new tests. The media layout tests are disabled on the Qt port but hopefully with this
     13        switch we can enable them again.
     14
     15        * WebCore.pri:
     16        * WebCore.pro:
     17        * features.pri:
     18
    1192011-07-26  Pavel Feldman  <pfeldman@google.com>
    220

  • trunk/Source/WebCore/WebCore.pri

    r90269 r91752  
    255255
    256256contains(DEFINES, ENABLE_VIDEO=1) {
    257     contains(DEFINES, USE_QTKIT=1) {
    258         DEFINES += WTF_USE_QTKIT=1
    259 
     257    contains(DEFINES, WTF_USE_QTKIT=1) {
    260258        INCLUDEPATH += $$PWD/platform/graphics/mac
    261259
    … …  
    264262                -framework QuartzCore -framework QTKit
    265263
    266     } else:contains(DEFINES, USE_GSTREAMER=1) {
    267         DEFINES += WTF_USE_GSTREAMER=1
     264    } else:contains(DEFINES, WTF_USE_GSTREAMER=1) {
    268265        DEFINES += ENABLE_GLIB_SUPPORT=1
    269266
    … …  
    271268
    272269        PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
    273     } else:contains(MOBILITY_CONFIG, multimedia) {
     270    } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
    274271        CONFIG   *= mobility
    275272        MOBILITY *= multimedia
    276         DEFINES  += WTF_USE_QT_MULTIMEDIA=1
    277273    }
    278274}

  • trunk/Source/WebCore/WebCore.pro

    r91694 r91752  
    30483048        DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    30493049
    3050     } else: contains(DEFINES, USE_GSTREAMER=1) {
     3050    } else: contains(DEFINES, WTF_USE_GSTREAMER=1) {
    30513051        HEADERS += \
    30523052            platform/graphics/gstreamer/GOwnPtrGStreamer.h \
    … …  
    30693069            platform/graphics/gstreamer/ImageGStreamerQt.cpp
    30703070
    3071     } else:contains(MOBILITY_CONFIG, multimedia) {
     3071    } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
    30723072        HEADERS += \
    30733073            platform/graphics/qt/MediaPlayerPrivateQt.h

  • trunk/Source/WebCore/features.pri

    r90359 r91752  
    185185    DEFINES += ENABLE_VIDEO=0
    186186
    187     contains(DEFINES, USE_QTKIT=1) {
     187    mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
    188188        DEFINES -= ENABLE_VIDEO=0
    189189        DEFINES += ENABLE_VIDEO=1
    190         DEFINES -= WTF_USE_QT_MULTIMEDIA=1
    191         DEFINES += WTF_USE_QT_MULTIMEDIA=0
    192     } else: contains(DEFINES, USE_GSTREAMER=1) {
     190        DEFINES += WTF_USE_QTKIT=1
     191        DEFINES -= WTF_USE_QTKIT=0
     192    } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
    193193        DEFINES -= ENABLE_VIDEO=0
    194194        DEFINES += ENABLE_VIDEO=1
    195         DEFINES -= WTF_USE_QT_MULTIMEDIA=1
    196         DEFINES += WTF_USE_QT_MULTIMEDIA=0
    197     } else:contains(MOBILITY_CONFIG, multimedia) {
     195        DEFINES += WTF_USE_GSTREAMER=1
     196        DEFINES -= WTF_USE_GSTREAMER=0
     197    } else: contains(MOBILITY_CONFIG, multimedia) {
    198198        DEFINES -= ENABLE_VIDEO=0
    199199        DEFINES += ENABLE_VIDEO=1

  • trunk/Source/WebKit/qt/ChangeLog

    r91669 r91752  
     12011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
     6        https://bugs.webkit.org/show_bug.cgi?id=63472
     7
     8        Use the flag WTF_USE_QTKIT=1 rather than USE_QTKIT=1 because that flag doesn't
     9        exist anymore, it's the default. Ditto for GStreamer.
     10
     11        * QtWebKit.pro:
     12
    1132011-07-25  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
    214

  • trunk/Source/WebKit/qt/QtWebKit.pro

    r90033 r91752  
    226226
    227227contains(DEFINES, ENABLE_VIDEO=1) {
    228     !contains(DEFINES, USE_QTKIT=1):!contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) {
     228    !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
    229229        HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h
    230230        SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp
    231231    }
    232232
    233     contains(DEFINES, USE_QTKIT=1) | contains(DEFINES, USE_GSTREAMER=1) | contains(MOBILITY_CONFIG, multimedia) {
     233    contains(DEFINES, WTF_USE_QTKIT=1) | contains(DEFINES, WTF_USE_GSTREAMER=1) | contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
    234234        HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h
    235235        SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp
    236236    }
    237237
    238     contains(DEFINES, USE_QTKIT=1) {
     238    contains(DEFINES, WTF_USE_QTKIT=1) {
    239239        INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/ \
    240240                       $$SOURCE_DIR/WebCore/platform/mac/ \
Note: See TracChangeset for help on using the changeset viewer.