Changeset 128987 in webkit

Timestamp:

Sep 19, 2012 4:12:40 AM (12 years ago)

Author:

Simon Hausmann

Message:

[Qt] Link failure with bfd linker on --minimal build
​https://bugs.webkit.org/show_bug.cgi?id=97075

Reviewed by Tor Arne Vestbø.

Fix two dependency errors triggered by --minimal:

• GStreamerVersioning.cpp uses functions from libgstvideo (gst_video_format_parse_caps), so we need to pull

that module not only when video is enabled by generally when using gstreamer.

• GraphicsSurfaceGLX depends on Xlib (XOpenDisplay, etc.), so we need to do CONFIG += x11 to get that and not

implicitly rely on x11 netscape plugins being enabled.

• WebCore.pri:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Simon Hausmann  <simon.hausmann@digia.com>
+
+        [Qt] Link failure with bfd linker on --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=97075
+
+        Reviewed by Tor Arne Vestbø.
+
+        Fix two dependency errors triggered by --minimal:
+
+        - GStreamerVersioning.cpp uses functions from libgstvideo (gst_video_format_parse_caps), so we need to pull
+        that module not only when video is enabled by generally when using gstreamer.
+        - GraphicsSurfaceGLX depends on Xlib (XOpenDisplay, etc.), so we need to do CONFIG += x11 to get that and not
+        implicitly rely on x11 netscape plugins being enabled.
+
+        * WebCore.pri:
+
 2012-09-19  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/WebCore.pri

@@ -131 +131 @@
         } else {
             xlibAvailable() {
-                CONFIG += x11
+                CONFIG *= x11
                 LIBS += -lXrender
                 DEFINES += MOZ_X11
@@ -168 +168 @@
 use?(GSTREAMER) {
     DEFINES += ENABLE_GLIB_SUPPORT=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
+    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
 }
 
@@ -194 +194 @@
     } else:use?(GSTREAMER) {
         INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
-        PKGCONFIG += gstreamer-video-0.10
     } else:use?(QT_MULTIMEDIA) {
         CONFIG   *= mobility
@@ -213 +212 @@
 }
 
-use?(graphics_surface) {
+use?(GRAPHICS_SURFACE) {
     mac: LIBS += -framework IOSurface -framework CoreFoundation
-    linux-*: LIBS += -lXcomposite -lXrender
+    linux-*: {
+        LIBS += -lXcomposite -lXrender
+        CONFIG *= x11
+    }
 }