Title: [128987] trunk/Source/WebCore
- Revision
- 128987
- Author
- [email protected]
- Date
- 2012-09-19 04:12:40 -0700 (Wed, 19 Sep 2012)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128986 => 128987)
--- trunk/Source/WebCore/ChangeLog 2012-09-19 10:55:28 UTC (rev 128986)
+++ trunk/Source/WebCore/ChangeLog 2012-09-19 11:12:40 UTC (rev 128987)
@@ -1,3 +1,19 @@
+2012-09-19 Simon Hausmann <[email protected]>
+
+ [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 <[email protected]>
MediaStream API: Rename the RTCIceServer uri parameter to url.
Modified: trunk/Source/WebCore/WebCore.pri (128986 => 128987)
--- trunk/Source/WebCore/WebCore.pri 2012-09-19 10:55:28 UTC (rev 128986)
+++ trunk/Source/WebCore/WebCore.pri 2012-09-19 11:12:40 UTC (rev 128987)
@@ -130,7 +130,7 @@
# Note: XP_MACOSX is defined in npapi.h
} else {
xlibAvailable() {
- CONFIG += x11
+ CONFIG *= x11
LIBS += -lXrender
DEFINES += MOZ_X11
}
@@ -167,7 +167,7 @@
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
}
enable?(VIDEO) {
@@ -193,7 +193,6 @@
}
} else:use?(GSTREAMER) {
INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
- PKGCONFIG += gstreamer-video-0.10
} else:use?(QT_MULTIMEDIA) {
CONFIG *= mobility
MOBILITY *= multimedia
@@ -212,9 +211,12 @@
contains(QT_CONFIG, opengles2):!win32: LIBS += -lEGL
}
-use?(graphics_surface) {
+use?(GRAPHICS_SURFACE) {
mac: LIBS += -framework IOSurface -framework CoreFoundation
- linux-*: LIBS += -lXcomposite -lXrender
+ linux-*: {
+ LIBS += -lXcomposite -lXrender
+ CONFIG *= x11
+ }
}
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
