Title: [115184] trunk
- Revision
- 115184
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-25 04:36:22 -0700 (Wed, 25 Apr 2012)
Log Message
Webkit build fails due to missing gstreamer include file on Kubuntu 8.04
https://bugs.webkit.org/show_bug.cgi?id=81913
Patch by Philippe Normand <pnorm...@igalia.com> on 2012-04-25
Reviewed by Tor Arne Vestbø.
Source/WTF:
* WTF.pri: GStreamer build support implies GLib support, as it's
done in WebCore.pri.
Tools:
* qmake/mkspecs/features/features.prf: Check for gstreamer-0.10
and gstreamer-plugins-base >= 0.10.30 just like the GTK port
does. 0.10.27 is unfortunately not recent enough to get the media
player working reliably.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (115183 => 115184)
--- trunk/Source/WTF/ChangeLog 2012-04-25 11:17:44 UTC (rev 115183)
+++ trunk/Source/WTF/ChangeLog 2012-04-25 11:36:22 UTC (rev 115184)
@@ -1,3 +1,13 @@
+2012-04-25 Philippe Normand <pnorm...@igalia.com>
+
+ Webkit build fails due to missing gstreamer include file on Kubuntu 8.04
+ https://bugs.webkit.org/show_bug.cgi?id=81913
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WTF.pri: GStreamer build support implies GLib support, as it's
+ done in WebCore.pri.
+
2012-04-24 Benjamin Poulain <bpoul...@apple.com>
Generalize the single character optimization of r114072
Modified: trunk/Source/WTF/WTF.pri (115183 => 115184)
--- trunk/Source/WTF/WTF.pri 2012-04-25 11:17:44 UTC (rev 115183)
+++ trunk/Source/WTF/WTF.pri 2012-04-25 11:36:22 UTC (rev 115184)
@@ -41,11 +41,9 @@
QT += v8-private declarative
}
-linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
- DEFINES += ENABLE_GLIB_SUPPORT=1
- PKGCONFIG += glib-2.0 gio-2.0
- }
+linux-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
+ DEFINES += ENABLE_GLIB_SUPPORT=1
+ PKGCONFIG += glib-2.0 gio-2.0
}
win32-* {
Modified: trunk/Tools/ChangeLog (115183 => 115184)
--- trunk/Tools/ChangeLog 2012-04-25 11:17:44 UTC (rev 115183)
+++ trunk/Tools/ChangeLog 2012-04-25 11:36:22 UTC (rev 115184)
@@ -1,3 +1,16 @@
+2012-04-25 Philippe Normand <pnorm...@igalia.com>
+
+ Webkit build fails due to missing gstreamer include file on Kubuntu 8.04
+ https://bugs.webkit.org/show_bug.cgi?id=81913
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/features.prf: Check for gstreamer-0.10
+ and gstreamer-plugins-base >= 0.10.30 just like the GTK port
+ does. 0.10.27 is unfortunately not recent enough to get the media
+ player working reliably.
+
+
2012-04-25 Xiaobo Wang <xbw...@torchmobile.com.cn>
[BlackBerry] Run tests in '/http/tests/local' with local URI
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (115183 => 115184)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-25 11:17:44 UTC (rev 115183)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-25 11:36:22 UTC (rev 115184)
@@ -219,7 +219,7 @@
DEFINES += WTF_USE_QTKIT=1
DEFINES -= WTF_USE_QTKIT=0
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'): {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
DEFINES += WTF_USE_GSTREAMER=1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
