Title: [144208] trunk
- Revision
- 144208
- Author
- [email protected]
- Date
- 2013-02-27 10:18:13 -0800 (Wed, 27 Feb 2013)
Log Message
Switch QtWebKit to GStreamer 1.0.
https://bugs.webkit.org/show_bug.cgi?id=106669.
Original patch by Sebastian Dröge.
Reviewed by Csaba Osztrogonác.
Source/WebCore:
* WebCore.pri:
Tools:
Build with GStreamer 1.0 if available, but support GStreamer 0.10
temporarily to make upgrading easy and the patch suitable for Qt5.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144207 => 144208)
--- trunk/Source/WebCore/ChangeLog 2013-02-27 18:01:48 UTC (rev 144207)
+++ trunk/Source/WebCore/ChangeLog 2013-02-27 18:18:13 UTC (rev 144208)
@@ -1,3 +1,13 @@
+2013-02-27 Allan Sandfeld Jensen <[email protected]>
+
+ Switch QtWebKit to GStreamer 1.0.
+ https://bugs.webkit.org/show_bug.cgi?id=106669.
+
+ Original patch by Sebastian Dröge.
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCore.pri:
+
2013-02-27 Eli Fidler <[email protected]>
[BlackBerry] Fix BlackBerry::Platform::String to WTF::String conversion when the string is Latin-1-encoded.
Modified: trunk/Source/WebCore/WebCore.pri (144207 => 144208)
--- trunk/Source/WebCore/WebCore.pri 2013-02-27 18:01:48 UTC (rev 144207)
+++ trunk/Source/WebCore/WebCore.pri 2013-02-27 18:18:13 UTC (rev 144208)
@@ -170,7 +170,13 @@
use?(GSTREAMER) {
DEFINES += WTF_USE_GLIB=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) {
@@ -212,7 +218,11 @@
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
+ }
}
}
Modified: trunk/Tools/ChangeLog (144207 => 144208)
--- trunk/Tools/ChangeLog 2013-02-27 18:01:48 UTC (rev 144207)
+++ trunk/Tools/ChangeLog 2013-02-27 18:18:13 UTC (rev 144208)
@@ -1,3 +1,16 @@
+2013-02-27 Allan Sandfeld Jensen <[email protected]>
+
+ Switch QtWebKit to GStreamer 1.0.
+ https://bugs.webkit.org/show_bug.cgi?id=106669.
+
+ Original patch by Sebastian Dröge.
+ Reviewed by Csaba Osztrogonác.
+
+ Build with GStreamer 1.0 if available, but support GStreamer 0.10
+ temporarily to make upgrading easy and the patch suitable for Qt5.
+
+ * qmake/mkspecs/features/features.prf:
+
2013-02-27 Szilard Ledan <[email protected]>
Unreviewed. Added myself to committers.py
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (144207 => 144208)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-02-27 18:01:48 UTC (rev 144207)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-02-27 18:18:13 UTC (rev 144208)
@@ -113,8 +113,10 @@
}
} 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"
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
