From 8505f0fa48cc79d51616b923c6e2c778c4b46a44 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 10 Dec 2013 12:13:37 +0000 Subject: libmatchbox: use PACKAGECONFIG 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/libmatchbox') diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb index 118c808cfc..e2e971ecc7 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" -- cgit 1.2.3-korg