Title: [91771] trunk/Source/WebCore
- Revision
- 91771
- Author
- alexis.men...@openbossa.org
- Date
- 2011-07-26 12:14:38 -0700 (Tue, 26 Jul 2011)
Log Message
[Qt] Disable video support on linux if the dependencies are not found.
If we can't find the necessary dependencies to build the GStreamer media player
we disable the video support. This is related to http://trac.webkit.org/changeset/91752.
Reviewed by Holger Freyther.
No new tests, it's a build fix.
* features.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91770 => 91771)
--- trunk/Source/WebCore/ChangeLog 2011-07-26 19:13:07 UTC (rev 91770)
+++ trunk/Source/WebCore/ChangeLog 2011-07-26 19:14:38 UTC (rev 91771)
@@ -1,3 +1,16 @@
+2011-07-26 Alexis Menard <alexis.men...@openbossa.org>
+
+ [Qt] Disable video support on linux if the dependencies are not found.
+
+ If we can't find the necessary dependencies to build the GStreamer media player
+ we disable the video support. This is related to http://trac.webkit.org/changeset/91752.
+
+ Reviewed by Holger Freyther.
+
+ No new tests, it's a build fix.
+
+ * features.pri:
+
2011-07-26 Evan Martin <e...@chromium.org>
regression: generating CSSValueKeywords should not print by default
Modified: trunk/Source/WebCore/features.pri (91770 => 91771)
--- trunk/Source/WebCore/features.pri 2011-07-26 19:13:07 UTC (rev 91770)
+++ trunk/Source/WebCore/features.pri 2011-07-26 19:14:38 UTC (rev 91771)
@@ -190,10 +190,16 @@
DEFINES += WTF_USE_QTKIT=1
DEFINES -= WTF_USE_QTKIT=0
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- DEFINES -= ENABLE_VIDEO=0
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_GSTREAMER=1
- DEFINES -= WTF_USE_GSTREAMER=0
+ system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ DEFINES -= ENABLE_VIDEO=0
+ DEFINES += ENABLE_VIDEO=1
+ DEFINES += WTF_USE_GSTREAMER=1
+ DEFINES -= WTF_USE_GSTREAMER=0
+ } else {
+ message("Disabling video due the lack of GLib/Gio/GStreamer.")
+ DEFINES -= ENABLE_VIDEO=1
+ DEFINES += ENABLE_VIDEO=0
+ }
} else: contains(MOBILITY_CONFIG, multimedia) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
