diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-19 12:09:14 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-19 12:09:17 +0100 |
| commit | faad8d1df1aee67f9d1a7e9ea3c13f92d04baf8e (patch) | |
| tree | 3adb30564d71e2f2fd74801240ec220e3d465e33 | |
| parent | fc289452b6465009a4c7ae6aa70060e55779a81c (diff) | |
| download | meta-qt5-faad8d1df1aee67f9d1a7e9ea3c13f92d04baf8e.tar.gz | |
qtmultimedia: Use PACKAGECONFIG for gstremer-0.10 and change it to disabled by default
* it doesn't support gst-1.x like qtwebkit yet, disable it by default to
build images without gst-0.10 where possible.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 87269850..66133f4b 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc | |||
| @@ -1,13 +1,17 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | DEPENDS += "qtdeclarative gstreamer gst-plugins-base alsa-lib " | 3 | DEPENDS += "qtdeclarative alsa-lib" |
| 4 | 4 | ||
| 5 | PACKAGECONFIG ??= "" | 5 | PACKAGECONFIG ??= "" |
| 6 | PACKAGECONFIG[openal] = ",,openal-soft" | 6 | PACKAGECONFIG[openal] = ",,openal-soft" |
| 7 | PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base" | ||
| 7 | 8 | ||
| 8 | do_configure_prepend() { | 9 | do_configure_prepend() { |
| 9 | # disable openal test if it isn't enabled by PACKAGECONFIG | 10 | # disable openal test if it isn't enabled by PACKAGECONFIG |
| 10 | sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro | 11 | sed -i 's/^qtCompileTest(openal)/OE_OPENAL_ENABLED:qtCompileTest(openal)/g' ${S}/qtmultimedia.pro |
| 12 | # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG | ||
| 13 | sed -i 's/^\( *\)qtCompileTest(gstreamer)/\1OE_GSTREAMER010_ENABLED:qtCompileTest(gstreamer) {/g' ${S}/qtmultimedia.pro | ||
| 11 | } | 14 | } |
| 12 | 15 | ||
| 13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" | 16 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" |
| 17 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" | ||
