Commit b616718d authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[Qt] GStreamer detection does not work when cross-compiling

https://bugs.webkit.org/show_bug.cgi?id=96608

Patch by Simon Hausmann <simon.hausmann@nokia.com> 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128422 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4b671638
2012-09-13 Simon Hausmann <simon.hausmann@nokia.com>
[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 <christophe.dumez@intel.com>
 
[WK2][WTR] More efficient string handling in InjectedBundlePage
......
......@@ -111,7 +111,7 @@ defineTest(detectFeatures) {
}
} 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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment