diff options
| -rw-r--r-- | Source/WebCore/WebCore.pri | 14 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 6c9ce5c9e..fc504427c 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -167,7 +167,13 @@ enable?(GAMEPAD) { use?(GSTREAMER) { DEFINES += ENABLE_GLIB_SUPPORT=1 - 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 + use?(GSTREAMER010) { + 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 + } else { + DEFINES += GST_API_VERSION=1.0 + DEFINES += GST_API_VERSION_1 + PKGCONFIG += glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-base-1.0 gstreamer-pbutils-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 + } } enable?(VIDEO) { @@ -202,7 +208,11 @@ enable?(WEB_AUDIO) { use?(GSTREAMER) { DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1 INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer - PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10 + use?(GSTREAMER010) { + PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10 + } else { + PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0 + } } } diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 6385887d2..4b2e3e649 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -113,8 +113,10 @@ defineTest(detectFeatures) { } } else: linux-* { - !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { + !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { WEBKIT_CONFIG += video use_gstreamer + } else:!contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { + WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 } else { CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support" } |