Changeset 91771 in webkit

Timestamp:

Jul 26, 2011 12:14:38 PM (13 years ago)

Author:

alexis.menard@openbossa.org

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• features.pri (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-26  Alexis Menard  <alexis.menard@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  <evan@chromium.org>
 

trunk/Source/WebCore/features.pri

@@ -191 +191 @@
         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