[PATCH][meta-qt5 1/2] qtcharts: Add dependency on qtmultimedia

[PATCH][meta-qt5 1/2] qtcharts: Add dependency on qtmultimedia

[Martin Jansa]

* fixes QA:
  qtcharts-5.6.99+5.7.0-beta+gitAUTOINC+8a78184181: qtcharts-examples rdepends on qtmultimedia, but it isn't a build dependency, missing qtmultimedia in DEPENDS or PACKAGECONFIG? [build-deps]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtcharts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 5aaddc9..99d1471 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
 SRCREV = "8a781841812a42ed728a76c0dcdcaa6196eac44e"
-- 
2.8.4

[PATCH][meta-qt5 2/2] qtwayland: add dependency on libxcomposite

[Martin Jansa]

* fixes QA:
  qtwayland-5.6.99+5.7.0-beta+gitAUTOINC+d27075a3f9: qtwayland-plugins rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtwayland_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 8f01658..e36d2c0 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 # libxkbcommon isn't mandatory make it easier to remove by .bbappend
 # (e.g. for building qtwayland with danny which doesn't have libxkbcommon in oe-core).
 XKB_DEPENDS = "libxkbcommon xproto"
-DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}"
+DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite', '', d)}"
 
 QT_WAYLAND_CONFIG ?= "wayland-compositor"
 QT_WAYLAND_DEFINES ?= ""
-- 
2.8.4

Re: [PATCH][meta-qt5 1/2] qtcharts: Add dependency on qtmultimedia

[Jonathan Liu]

On 9 June 2016 at 00:00, Martin Jansa <martin.jansa@gmail.com> wrote:
> * fixes QA:
>   qtcharts-5.6.99+5.7.0-beta+gitAUTOINC+8a78184181: qtcharts-examples rdepends on qtmultimedia, but it isn't a build dependency, missing qtmultimedia in DEPENDS or PACKAGECONFIG? [build-deps]
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-qt/qt5/qtcharts_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
> index 5aaddc9..99d1471 100644
> --- a/recipes-qt/qt5/qtcharts_git.bb
> +++ b/recipes-qt/qt5/qtcharts_git.bb
> @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = " \
>      file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
>  "
>
> -DEPENDS += "qtbase qtdeclarative"
> +DEPENDS += "qtbase qtdeclarative qtmultimedia"
>
>  SRCREV = "8a781841812a42ed728a76c0dcdcaa6196eac44e"
> --
> 2.8.4

Looks good to me. Though qtmultimedia is only needed if the "examples"
PACKAGECONFIG is enabled in either qtbase or qtcharts. I wonder if
there is a good way to make the dependency conditional on that.

Regards,
Jonathan