Patchwork [2/2] libmatchbox: use PACKAGECONFIG

login
register
mail settings
Submitter Ross Burton
Date Dec. 10, 2013, 12:13 p.m.
Message ID <1386677617-20952-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/63133/
State Accepted
Commit 4398019673c6e638f4a5c9b4b2d7110ab0452671
Headers show

Comments

Ross Burton - Dec. 10, 2013, 12:13 p.m.
Use PACKAGECONFIG to offer some flexibility to the libmatchbox configuration,
and remove two spurious build dependencies (expat and libstartup-notification).

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Trevor Woerner - Dec. 14, 2013, 2:18 p.m.
Hi Ross,

Your commit message and your commit don't seem to agree. I.e. you say
you've removed 2 dependencies, but it looks like you've actually removed
more than just 2.

On 12/10/13 07:13, Ross Burton wrote:
> Use PACKAGECONFIG to offer some flexibility to the libmatchbox configuration,
> and remove two spurious build dependencies (expat and libstartup-notification).
[snip]
> -DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
> +DEPENDS = "virtual/libx11 libxext"
Ross Burton - Dec. 16, 2013, 12:06 p.m.
On 14 December 2013 14:18, Trevor Woerner <trevor.woerner@linaro.org> wrote:
> Hi Ross,
>
> Your commit message and your commit don't seem to agree. I.e. you say
> you've removed 2 dependencies, but it looks like you've actually removed
> more than just 2.

The other dependencies just moved into PACKAGECONFIG statements.

Ross

Patch

diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index 118c808..e2e971e 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -8,7 +8,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
                     file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \
                     file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51"
 
-DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
+DEPENDS = "virtual/libx11 libxext"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
            file://libpng.patch"
@@ -18,4 +18,9 @@  SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-jpeg --enable-xsettings"
+PACKAGECONFIG ??= "jpeg png xft xsettings"
+PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft"
+PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client"