[oe] [meta-oe][PATCH] lirc: Make X support to be a packageconfig

[Christian Ege]

2015-05-20 8:04 GMT+02:00 Khem Raj <raj.khem at gmail.com>:
> When we dont have x11 in distro features it fails to build
> since libx11 dependency is not satisfied
>
> Change-Id: I6774a83f965551a41afe12b1304e44e73fc789c0
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  meta-oe/recipes-connectivity/lirc/lirc.inc      | 2 +-
>  meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-connectivity/lirc/lirc.inc b/meta-oe/recipes-connectivity/lirc/lirc.inc
> index 77b6c28..429bc45 100644
> --- a/meta-oe/recipes-connectivity/lirc/lirc.inc
> +++ b/meta-oe/recipes-connectivity/lirc/lirc.inc
> @@ -6,7 +6,7 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config
>  HOMEPAGE = "http://www.lirc.org"
>  SECTION = "console/network"
>  LICENSE = "GPLv2"
> -DEPENDS = "alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 libx11"
> +DEPENDS = "alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19"
What's happening if X11 is available, will this trigger a QA issue
because lirc links against x11 but x11 is not in DEPENDS Variable?

>  PRIORITY = "optional"
>
>  SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2"
> diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
> index c3e61c4..7d93757 100644
> --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
> +++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
> @@ -19,9 +19,11 @@ SYSTEMD_AUTO_ENABLE_lirc = "enable"
>
>  inherit autotools pkgconfig systemd pythonnative
>
> -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
> +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd"
> +PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11,"
>
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
> +PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
> +PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)}"
>
>  #EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"'
>  do_install_append() {
> --
> 2.1.4
regards,
Christian