From 986e49c43bce4539e0847b2232eb91a649af291b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 8 Oct 2008 15:25:01 +0000 Subject: matchbox-panel: enable the relevant battery plugin depending on the machine features git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5462 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb index 4dfd81b24..cf2370165 100644 --- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb +++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb @@ -1,8 +1,11 @@ LICENSE = "GPLv2" PRIORITY = "optional" -DEPENDS = "gtk+ startup-notification apmd dbus dbus-glib" +DEPENDS = "gtk+ startup-notification dbus dbus-glib" +DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" +DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" + PV = "0.0+svnr${SRCREV}" -PR = "r3" +PR = "r4" RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" @@ -11,6 +14,8 @@ RCONFLICTS_${PN} = "matchbox-panel" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" +EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" +EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" S = "${WORKDIR}/${PN}" -- cgit v1.2.3