Title: [128422] trunk/Tools
- Revision
- 128422
- Author
- [email protected]
- Date
- 2012-09-13 01:31:24 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] GStreamer detection does not work when cross-compiling
https://bugs.webkit.org/show_bug.cgi?id=96608
Patch by Simon Hausmann <[email protected]> on 2012-09-13
Reviewed by Kenneth Rohde Christiansen.
When cross-compiling it is not safe to just use system(pkg-config),
because there is a high probability that it will find packages in the
host system instead of in the target one. Instead use qmake's new
packagesExist() function that takes care of this delicate aspect of
cross compilation by setting PKG_CONFIG_SYSROOT_DIR and
PKG_CONFIG_LIBDIR accordingly.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128421 => 128422)
--- trunk/Tools/ChangeLog 2012-09-13 08:29:30 UTC (rev 128421)
+++ trunk/Tools/ChangeLog 2012-09-13 08:31:24 UTC (rev 128422)
@@ -1,3 +1,19 @@
+2012-09-13 Simon Hausmann <[email protected]>
+
+ [Qt] GStreamer detection does not work when cross-compiling
+ https://bugs.webkit.org/show_bug.cgi?id=96608
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ When cross-compiling it is not safe to just use system(pkg-config),
+ because there is a high probability that it will find packages in the
+ host system instead of in the target one. Instead use qmake's new
+ packagesExist() function that takes care of this delicate aspect of
+ cross compilation by setting PKG_CONFIG_SYSROOT_DIR and
+ PKG_CONFIG_LIBDIR accordingly.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-09-13 Christophe Dumez <[email protected]>
[WK2][WTR] More efficient string handling in InjectedBundlePage
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (128421 => 128422)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-13 08:29:30 UTC (rev 128421)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-09-13 08:31:24 UTC (rev 128422)
@@ -111,7 +111,7 @@
}
} else: linux-* {
- !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\'): {
+ !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
WEBKIT_CONFIG += video use_gstreamer
} else {
CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
