Changeset 144208 in webkit
- Timestamp:
- Feb 27, 2013 10:18:13 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r144205 r144208 1 2013-02-27 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Switch QtWebKit to GStreamer 1.0. 4 https://bugs.webkit.org/show_bug.cgi?id=106669. 5 6 Original patch by Sebastian Dröge. 7 Reviewed by Csaba Osztrogonác. 8 9 * WebCore.pri: 10 1 11 2013-02-27 Eli Fidler <efidler@rim.com> 2 12 -
trunk/Source/WebCore/WebCore.pri
r143571 r144208 171 171 use?(GSTREAMER) { 172 172 DEFINES += WTF_USE_GLIB=1 173 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 173 use?(GSTREAMER010) { 174 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 175 } else { 176 DEFINES += GST_API_VERSION=1.0 177 DEFINES += GST_API_VERSION_1 178 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 179 } 174 180 } 175 181 … … 213 219 DEFINES += WTF_USE_WEBAUDIO_GSTREAMER=1 214 220 INCLUDEPATH += $$SOURCE_DIR/platform/audio/gstreamer 215 PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10 221 use?(GSTREAMER010) { 222 PKGCONFIG += gstreamer-audio-0.10 gstreamer-fft-0.10 223 } else { 224 PKGCONFIG += gstreamer-audio-1.0 gstreamer-fft-1.0 225 } 216 226 } 217 227 } -
trunk/Tools/ChangeLog
r144201 r144208 1 2013-02-27 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 3 Switch QtWebKit to GStreamer 1.0. 4 https://bugs.webkit.org/show_bug.cgi?id=106669. 5 6 Original patch by Sebastian Dröge. 7 Reviewed by Csaba Osztrogonác. 8 9 Build with GStreamer 1.0 if available, but support GStreamer 0.10 10 temporarily to make upgrading easy and the patch suitable for Qt5. 11 12 * qmake/mkspecs/features/features.prf: 13 1 14 2013-02-27 Szilard Ledan <szledan@inf.u-szeged.hu> 2 15 -
trunk/Tools/qmake/mkspecs/features/features.prf
r142355 r144208 114 114 115 115 } else: linux-* { 116 !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\'") {116 !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { 117 117 WEBKIT_CONFIG += video use_gstreamer 118 } 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\'") { 119 WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 118 120 } else { 119 121 CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support"
Note: See TracChangeset
for help on using the changeset viewer.