path: root/package
diff options
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:47 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 23:10:08 +0200
commit302f28de8011fb462dd119ffbc89686862da0a2b (patch)
tree966845f97429116394e5bf638b5b814e50b4b3cb /package
parent890bfa58d5b26459b3d43d5998906f9ee0178d05 (diff)
package/matchbox-panel: use ACPI for the battery applet
It is possible to use ACPI to monitor the battery with the battery mini-applet. If ACPI is not explicitly enabled, then APM is used if available; if ACPI is not explcitly enabled and APM is not available, then the battery applet is not built. However, APM is not really current nowadays, and possibly missing for a bunch of architecture... What is a pity is that there is no way to explicitly enable or disable the applet; it only relies on auto-detection... :-( So, forcibly use ACPI on platforms that have it, that is x86 (32- and 64-bit) and AArch64. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
2 files changed, 28 insertions, 0 deletions
diff --git a/package/matchbox-panel/0003-mb-applet-battery.patch b/package/matchbox-panel/0003-mb-applet-battery.patch
new file mode 100644
index 0000000000..585eb39166
--- /dev/null
+++ b/package/matchbox-panel/0003-mb-applet-battery.patch
@@ -0,0 +1,21 @@
+mb-applet-battery: don't declare line_parse as static
+Fix this build failure:
+ mb-applet-battery.c: In function 'read_apm':
+ mb-applet-battery.c:181:2: error: invalid storage class for function 'line_parse'
+Reported-by: Arnout Vandecappelle <arnout@mind.be>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+diff -durN matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c matchbox-panel-0.9.3/applets/mb-applet-battery.c
+--- matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c 2006-02-07 23:27:24.000000000 +0100
++++ matchbox-panel-0.9.3/applets/mb-applet-battery.c 2015-05-02 17:13:00.843578796 +0200
+@@ -177,7 +177,7 @@
+ unsigned long present_rate;
+ };
+- static int
++ int
+ line_parse(char *line, struct entry *e)
+ {
+ char *ptr;
diff --git a/package/matchbox-panel/matchbox-panel.mk b/package/matchbox-panel/matchbox-panel.mk
index f7d699bdac..a5da7806b1 100644
--- a/package/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox-panel/matchbox-panel.mk
@@ -20,6 +20,13 @@ else
MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
+# Using ACPI is only possible on x86 (32- or 64-bit) or AArch64
+ifeq ($(BR2_aarch64)$(BR2_i386)$(BR2_x86_64),y)
+MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux
+MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux