* [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:29 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm " Yann E. MORIN
` (29 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, the matchbox package is using weird, legacy constrcuts to
build its different parts.
Notably, it adds matchbox-lib to the list of packages to build, even
though it is not a real package since it does not have a Kconfig entry.
Fix that:
- add a Kconfig entry for matchbox-lib
- select it from the top-level matchbox package
Note that matchbox-common already depends on matchbox-lib.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 3 +++
package/matchbox/matchbox-lib/Config.in | 2 ++
package/matchbox/matchbox.mk | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 package/matchbox/matchbox-lib/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 7867ae3..70cc168 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MATCHBOX
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
+ select BR2_PACKAGE_MATCHBOX_LIB
help
Matchbox is an Open Source base environment for the X Window
System running on non-desktop embedded platforms such as
@@ -17,6 +18,8 @@ config BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
+source "package/matchbox/matchbox-lib/Config.in"
+
config BR2_PACKAGE_MATCHBOX_PANEL
bool "Matchbox Panel"
help
diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
new file mode 100644
index 0000000..480e6fe
--- /dev/null
+++ b/package/matchbox/matchbox-lib/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_MATCHBOX_LIB
+ bool
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index fe1a7db..e367df2 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,4 +1,4 @@
ifeq ($(BR2_PACKAGE_MATCHBOX),y)
include $(sort $(wildcard package/matchbox/*/*.mk))
-PACKAGES += matchbox-lib matchbox-wm
+PACKAGES += matchbox-wm
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:35 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options Yann E. MORIN
` (28 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Similarly to what we just did for matchbox-lib, we make matchbox-wm a
real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 2 ++
package/matchbox/matchbox-wm/Config.in | 3 +++
package/matchbox/matchbox.mk | 1 -
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 package/matchbox/matchbox-wm/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 70cc168..15b1017 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
+ select BR2_PACKAGE_MATCHBOX_WM
help
Matchbox is an Open Source base environment for the X Window
System running on non-desktop embedded platforms such as
@@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
source "package/matchbox/matchbox-lib/Config.in"
+source "package/matchbox/matchbox-wm/Config.in"
config BR2_PACKAGE_MATCHBOX_PANEL
bool "Matchbox Panel"
diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
new file mode 100644
index 0000000..6ad5dfc
--- /dev/null
+++ b/package/matchbox/matchbox-wm/Config.in
@@ -0,0 +1,3 @@
+config BR2_PACKAGE_MATCHBOX_WM
+ bool
+ select BR2_PACKAGE_MATCHBOX_LIB
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index e367df2..17d89d8 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,4 +1,3 @@
ifeq ($(BR2_PACKAGE_MATCHBOX),y)
include $(sort $(wildcard package/matchbox/*/*.mk))
-PACKAGES += matchbox-wm
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:33 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package Yann E. MORIN
` (27 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-wm/matchbox-wm.mk | 3 ---
1 file changed, 3 deletions(-)
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 16f1417..da9efd7 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -25,10 +25,7 @@ endif
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
-#MATCHBOX_WM_OPTS += --enable-standalone-xft
MATCHBOX_WM_DEPENDENCIES += xlib_libXft
-else
-#MATCHBOX_WM_OPTS += --disable-standalone-xft
endif
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (2 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:36 ` Arnout Vandecappelle
2015-04-23 21:46 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop " Yann E. MORIN
` (26 subsequent siblings)
30 siblings, 2 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-panel is treated as if it were an option of the
matchbox package.
But that's not true, since it is a real package all by itself, with its
own archive and its own buildsystem.
So, make it a real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 7 +------
package/matchbox/matchbox-panel/Config.in | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 package/matchbox/matchbox-panel/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 15b1017..e791cea 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX
source "package/matchbox/matchbox-lib/Config.in"
source "package/matchbox/matchbox-wm/Config.in"
-
-config BR2_PACKAGE_MATCHBOX_PANEL
- bool "Matchbox Panel"
- help
- A flexible always present 'window bar' for holding
- application launchers.
+source "package/matchbox/matchbox-panel/Config.in"
config BR2_PACKAGE_MATCHBOX_DESKTOP
bool "Matchbox Desktop"
diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
new file mode 100644
index 0000000..e3daaf5
--- /dev/null
+++ b/package/matchbox/matchbox-panel/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MATCHBOX_PANEL
+ bool "Matchbox Panel"
+ select BR2_PACKAGE_MATCHBOX_LIB
+ help
+ A flexible always present 'window bar' for holding
+ application launchers.
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (3 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:49 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common " Yann E. MORIN
` (25 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-desktop is treated as if it were an option of the
matchbox package.
But that's not true, since it is a real package all by itself, with its
own archive and its own buildsystem.
So, make it a real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 7 +------
package/matchbox/matchbox-desktop/Config.in | 5 +++++
2 files changed, 6 insertions(+), 6 deletions(-)
create mode 100644 package/matchbox/matchbox-desktop/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index e791cea..39aff3c 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX
source "package/matchbox/matchbox-lib/Config.in"
source "package/matchbox/matchbox-wm/Config.in"
source "package/matchbox/matchbox-panel/Config.in"
-
-config BR2_PACKAGE_MATCHBOX_DESKTOP
- bool "Matchbox Desktop"
- select BR2_PACKAGE_ZLIB
- help
- A PDA style application launcher or 'item browser'.
+source "package/matchbox/matchbox-desktop/Config.in"
config BR2_PACKAGE_MATCHBOX_COMMON
bool "Matchbox session common files"
diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox/matchbox-desktop/Config.in
new file mode 100644
index 0000000..c9fd196
--- /dev/null
+++ b/package/matchbox/matchbox-desktop/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_MATCHBOX_DESKTOP
+ bool "Matchbox Desktop"
+ select BR2_PACKAGE_ZLIB
+ help
+ A PDA style application launcher or 'item browser'.
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (4 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:52 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey " Yann E. MORIN
` (24 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-common is treated as if it were an option of the
matchbox package.
But that's not true, since it is a real package all by itself, with its
own archive and its own buildsystem.
So, make it a real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 11 +----------
package/matchbox/matchbox-common/Config.in | 9 +++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 package/matchbox/matchbox-common/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 39aff3c..ead2649 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -23,16 +23,7 @@ source "package/matchbox/matchbox-lib/Config.in"
source "package/matchbox/matchbox-wm/Config.in"
source "package/matchbox/matchbox-panel/Config.in"
source "package/matchbox/matchbox-desktop/Config.in"
-
-config BR2_PACKAGE_MATCHBOX_COMMON
- bool "Matchbox session common files"
- depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
- help
- Common desktop folders and matchbox-session script.
-
-config BR2_PACKAGE_MATCHBOX_COMMON_PDA
- bool "PDA style desktop folders"
- depends on BR2_PACKAGE_MATCHBOX_COMMON
+source "package/matchbox/matchbox-common/Config.in"
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
new file mode 100644
index 0000000..7d22d05
--- /dev/null
+++ b/package/matchbox/matchbox-common/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_MATCHBOX_COMMON
+ bool "Matchbox session common files"
+ depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
+ help
+ Common desktop folders and matchbox-session script.
+
+config BR2_PACKAGE_MATCHBOX_COMMON_PDA
+ bool "PDA style desktop folders"
+ depends on BR2_PACKAGE_MATCHBOX_COMMON
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (5 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:54 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard " Yann E. MORIN
` (23 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-fakekey is missing a Kconfig entry, but is so far
solely a build-time dependency of matchbox-keyboard.
So, make it a real package, and select it from matchbox-keyboard.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 2 ++
package/matchbox/matchbox-fakekey/Config.in | 2 ++
2 files changed, 4 insertions(+)
create mode 100644 package/matchbox/matchbox-fakekey/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index ead2649..8d4ebc7 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -24,11 +24,13 @@ source "package/matchbox/matchbox-wm/Config.in"
source "package/matchbox/matchbox-panel/Config.in"
source "package/matchbox/matchbox-desktop/Config.in"
source "package/matchbox/matchbox-common/Config.in"
+source "package/matchbox/matchbox-fakekey/Config.in"
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_MATCHBOX_FAKEKEY
help
Virtual Keyboard
diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
new file mode 100644
index 0000000..334f3a2
--- /dev/null
+++ b/package/matchbox/matchbox-fakekey/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_MATCHBOX_FAKEKEY
+ bool
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (6 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 21:55 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor " Yann E. MORIN
` (22 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-keyboard is treated as if it were an option of the
matchbox package.
But that's not true, since it is a real package all by itself, with its
own archive and its own buildsystem.
So, make it a real package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 9 +--------
package/matchbox/matchbox-keyboard/Config.in | 7 +++++++
2 files changed, 8 insertions(+), 8 deletions(-)
create mode 100644 package/matchbox/matchbox-keyboard/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 8d4ebc7..9b27d4d 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -25,13 +25,6 @@ source "package/matchbox/matchbox-panel/Config.in"
source "package/matchbox/matchbox-desktop/Config.in"
source "package/matchbox/matchbox-common/Config.in"
source "package/matchbox/matchbox-fakekey/Config.in"
-
-config BR2_PACKAGE_MATCHBOX_KEYBOARD
- bool "Matchbox Virtual Keyboard"
- select BR2_PACKAGE_XLIB_LIBXTST
- select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
- select BR2_PACKAGE_MATCHBOX_FAKEKEY
- help
- Virtual Keyboard
+source "package/matchbox/matchbox-keyboard/Config.in"
endif
diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox/matchbox-keyboard/Config.in
new file mode 100644
index 0000000..e017358
--- /dev/null
+++ b/package/matchbox/matchbox-keyboard/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MATCHBOX_KEYBOARD
+ bool "Matchbox Virtual Keyboard"
+ select BR2_PACKAGE_XLIB_LIBXTST
+ select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_MATCHBOX_FAKEKEY
+ help
+ Virtual Keyboard
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor a real package
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (7 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 22:00 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes Yann E. MORIN
` (21 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-startup-monitor is missing a Kconfig entry, but is
so far solely a build-time dependency of matchbox-panel.
So, make it a real package, and only build-depend on it when enabled.
Fix the condition to build-depend on it.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 1 +
package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++--
package/matchbox/matchbox-startup-monitor/Config.in | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 9b27d4d..2f9b73d 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -26,5 +26,6 @@ source "package/matchbox/matchbox-desktop/Config.in"
source "package/matchbox/matchbox-common/Config.in"
source "package/matchbox/matchbox-fakekey/Config.in"
source "package/matchbox/matchbox-keyboard/Config.in"
+source "package/matchbox/matchbox-startup-monitor/Config.in"
endif
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index d3efed9..f7d699b 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -13,9 +13,9 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING
MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
MATCHBOX_PANEL_CONF_OPTS = --enable-expat
-ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
+ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y)
MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
-MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
+MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor
else
MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
endif
diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
new file mode 100644
index 0000000..4dd088f
--- /dev/null
+++ b/package/matchbox/matchbox-startup-monitor/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
+ bool
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (8 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor " Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 22:01 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 11/30] package/matchbox: point to new home Yann E. MORIN
` (20 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Now that the matchbox package no longer forcibly add entries to the
PACKAGES list, and entirely relies on having proper packages, we can
safely include all matchbox sub-packages .mk files, and the pkg-infra
will take care of building only those that are enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 17d89d8..ae989b3 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,3 +1 @@
-ifeq ($(BR2_PACKAGE_MATCHBOX),y)
include $(sort $(wildcard package/matchbox/*/*.mk))
-endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 11/30] package/matchbox: point to new home
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (9 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 8:58 ` Alexandre Belloni
2015-04-23 22:01 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox Yann E. MORIN
` (19 subsequent siblings)
30 siblings, 2 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
The new home of the matchbox project is with the Yocto
project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever
that is. ;-)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 2f9b73d..891ac95 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX
handhelds, set-top boxes, kiosks and anything else for which
screen space, input mechanisms or system resources are limited.
- http://matchbox-project.org/
+ https://www.yoctoproject.org/tools-resources/projects/matchbox
if BR2_PACKAGE_MATCHBOX
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (10 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 11/30] package/matchbox: point to new home Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 22:27 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts Yann E. MORIN
` (18 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, the matchbox entry in the menu is a non-package entry, that
forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the exisiting
matchbox-wm to simply matchbox, so we have a real package from the
onset.
Since we're reusing the previous option for the WM package, there is no
need for a entry in the legacy menu.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
.../{matchbox-wm => }/0001-defaulttheme.patch | 0
package/matchbox/Config.in | 2 --
package/matchbox/matchbox-wm/Config.in | 3 --
package/matchbox/matchbox-wm/matchbox-wm.mk | 38 --------------------
.../matchbox-wm.hash => matchbox.hash} | 0
package/matchbox/matchbox.mk | 40 ++++++++++++++++++++++
6 files changed, 40 insertions(+), 43 deletions(-)
rename package/matchbox/{matchbox-wm => }/0001-defaulttheme.patch (100%)
delete mode 100644 package/matchbox/matchbox-wm/Config.in
delete mode 100644 package/matchbox/matchbox-wm/matchbox-wm.mk
rename package/matchbox/{matchbox-wm/matchbox-wm.hash => matchbox.hash} (100%)
diff --git a/package/matchbox/matchbox-wm/0001-defaulttheme.patch b/package/matchbox/0001-defaulttheme.patch
similarity index 100%
rename from package/matchbox/matchbox-wm/0001-defaulttheme.patch
rename to package/matchbox/0001-defaulttheme.patch
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 891ac95..7d06bb2 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MATCHBOX
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
- select BR2_PACKAGE_MATCHBOX_WM
help
Matchbox is an Open Source base environment for the X Window
System running on non-desktop embedded platforms such as
@@ -20,7 +19,6 @@ config BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
source "package/matchbox/matchbox-lib/Config.in"
-source "package/matchbox/matchbox-wm/Config.in"
source "package/matchbox/matchbox-panel/Config.in"
source "package/matchbox/matchbox-desktop/Config.in"
source "package/matchbox/matchbox-common/Config.in"
diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
deleted file mode 100644
index 6ad5dfc..0000000
--- a/package/matchbox/matchbox-wm/Config.in
+++ /dev/null
@@ -1,3 +0,0 @@
-config BR2_PACKAGE_MATCHBOX_WM
- bool
- select BR2_PACKAGE_MATCHBOX_LIB
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
deleted file mode 100644
index da9efd7..0000000
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#
-# matchbox-wm
-#
-################################################################################
-
-MATCHBOX_WM_VERSION = 1.2
-MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
-MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
-MATCHBOX_WM_LICENSE = GPLv2+
-MATCHBOX_WM_LICENSE_FILES = COPYING
-
-MATCHBOX_WM_DEPENDENCIES = matchbox-lib
-MATCHBOX_WM_CONF_OPTS = --enable-expat
-
-# Workaround bug in configure script
-MATCHBOX_WM_CONF_ENV = expat=yes
-
-ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
-ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
-MATCHBOX_WM_CONF_OPTS += --enable-composite
-MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
-MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
-MATCHBOX_WM_DEPENDENCIES += xlib_libXft
-endif
-
-ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
-MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
-MATCHBOX_WM_DEPENDENCIES += startup-notification
-else
-MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
-endif
-
-$(eval $(autotools-package))
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.hash b/package/matchbox/matchbox.hash
similarity index 100%
rename from package/matchbox/matchbox-wm/matchbox-wm.hash
rename to package/matchbox/matchbox.hash
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index ae989b3..2d30ca0 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1 +1,41 @@
+################################################################################
+#
+# matchbox
+#
+################################################################################
+
+MATCHBOX_VERSION = 1.2
+MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2
+MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION)
+MATCHBOX_LICENSE = GPLv2+
+MATCHBOX_LICENSE_FILES = COPYING
+
+MATCHBOX_DEPENDENCIES = matchbox-lib
+MATCHBOX_CONF_OPTS = --enable-expat
+
+# Workaround bug in configure script
+MATCHBOX_CONF_ENV = expat=yes
+
+ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
+ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
+MATCHBOX_CONF_OPTS += --enable-composite
+MATCHBOX_DEPENDENCIES += xlib_libXcomposite
+MATCHBOX_DEPENDENCIES += xlib_libXpm
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
+MATCHBOX_DEPENDENCIES += xlib_libXft
+endif
+
+ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
+MATCHBOX_CONF_OPTS += --enable-startup-notification
+MATCHBOX_DEPENDENCIES += startup-notification
+else
+MATCHBOX_CONF_OPTS += --disable-startup-notification
+endif
+
+$(eval $(autotools-package))
+
+# After we called a package infra, w ecan include more files
include $(sort $(wildcard package/matchbox/*/*.mk))
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (11 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-23 22:26 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies Yann E. MORIN
` (17 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Use the package names instead of some fancy human-readable strings. ;-)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 2 +-
package/matchbox/matchbox-common/Config.in | 4 ++--
package/matchbox/matchbox-desktop/Config.in | 2 +-
package/matchbox/matchbox-keyboard/Config.in | 2 +-
package/matchbox/matchbox-panel/Config.in | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 7d06bb2..e58aaf2 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_MATCHBOX
- bool "MatchBox Window Manager"
+ bool "matchbox"
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_FONTCONFIG
diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
index 7d22d05..f1c4ce3 100644
--- a/package/matchbox/matchbox-common/Config.in
+++ b/package/matchbox/matchbox-common/Config.in
@@ -1,9 +1,9 @@
config BR2_PACKAGE_MATCHBOX_COMMON
- bool "Matchbox session common files"
+ bool "matchbox-common"
depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
help
Common desktop folders and matchbox-session script.
config BR2_PACKAGE_MATCHBOX_COMMON_PDA
- bool "PDA style desktop folders"
+ bool "PDA style app folder"
depends on BR2_PACKAGE_MATCHBOX_COMMON
diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox/matchbox-desktop/Config.in
index c9fd196..ed80c22 100644
--- a/package/matchbox/matchbox-desktop/Config.in
+++ b/package/matchbox/matchbox-desktop/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_MATCHBOX_DESKTOP
- bool "Matchbox Desktop"
+ bool "matchbox-desktop"
select BR2_PACKAGE_ZLIB
help
A PDA style application launcher or 'item browser'.
diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox/matchbox-keyboard/Config.in
index e017358..056a255 100644
--- a/package/matchbox/matchbox-keyboard/Config.in
+++ b/package/matchbox/matchbox-keyboard/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_MATCHBOX_KEYBOARD
- bool "Matchbox Virtual Keyboard"
+ bool "matchbox-keyboard"
select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
select BR2_PACKAGE_MATCHBOX_FAKEKEY
diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
index e3daaf5..47bd10a 100644
--- a/package/matchbox/matchbox-panel/Config.in
+++ b/package/matchbox/matchbox-panel/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_MATCHBOX_PANEL
- bool "Matchbox Panel"
+ bool "matchbox-panel"
select BR2_PACKAGE_MATCHBOX_LIB
help
A flexible always present 'window bar' for holding
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (12 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:01 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display Yann E. MORIN
` (16 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
matchbox-common can be used by both matchbox-desktop and matchbox-panel,
so it needs to depend on either, not both.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-common/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
index f1c4ce3..6ec4697 100644
--- a/package/matchbox/matchbox-common/Config.in
+++ b/package/matchbox/matchbox-common/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_MATCHBOX_COMMON
bool "matchbox-common"
- depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
+ depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
help
Common desktop folders and matchbox-session script.
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (13 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:02 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency Yann E. MORIN
` (15 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Currently, matchbox-common depends on either matchbox-dsktop or
matchbox-panel, and the three are organised so that matchbox-common gets
indented in the menuconfig.
That's a feature of menuconfig to consider the dependency chain to
indent sub-options.
Add a fake, prompt-less option to break that dependency chain.
Note: yes, this is an dirty hack.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-common/Config.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
index 6ec4697..93761f5 100644
--- a/package/matchbox/matchbox-common/Config.in
+++ b/package/matchbox/matchbox-common/Config.in
@@ -1,3 +1,8 @@
+# Hack! Break dependency chain so that matchbox-common does
+# not get indented below matchbox-panel or matchbox-desktop.
+config FOO
+ bool
+
config BR2_PACKAGE_MATCHBOX_COMMON
bool "matchbox-common"
depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (14 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:07 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency Yann E. MORIN
` (14 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
matchbox-fakekey build-depends on xlib_libXtst, but does not select it.
Fix that.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-fakekey/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
index 334f3a2..4708292 100644
--- a/package/matchbox/matchbox-fakekey/Config.in
+++ b/package/matchbox/matchbox-fakekey/Config.in
@@ -1,2 +1,3 @@
config BR2_PACKAGE_MATCHBOX_FAKEKEY
bool
+ select BR2_PACKAGE_XLIB_LIBXTST
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (15 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:19 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages Yann E. MORIN
` (13 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
matchbox-startup-monitor build-depends on startup-notifications, but
does not select it.
Fix that.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-startup-monitor/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
index 4dd088f..92a1241 100644
--- a/package/matchbox/matchbox-startup-monitor/Config.in
+++ b/package/matchbox/matchbox-startup-monitor/Config.in
@@ -1,2 +1,3 @@
config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
bool
+ select BR2_PACKAGE_STARTUP_NOTIFICATION
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (16 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:23 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager Yann E. MORIN
` (12 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
We currently do not have that many packages without a prompt, and when
we do, they are limited to system-related packages that can't be
selected or are forcibly selected under various system-specific
conditions.
This is clearly not the case for the matchbox sub-packages, so just give
them a prompt, even when they are forcibly selected by the main matchbox
package, and can't be selected without it.
That will at least tell the user those packages exist and are to be
built.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-fakekey/Config.in | 4 +++-
package/matchbox/matchbox-lib/Config.in | 4 +++-
package/matchbox/matchbox-startup-monitor/Config.in | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
index 4708292..889d039 100644
--- a/package/matchbox/matchbox-fakekey/Config.in
+++ b/package/matchbox/matchbox-fakekey/Config.in
@@ -1,3 +1,5 @@
config BR2_PACKAGE_MATCHBOX_FAKEKEY
- bool
+ bool "matchbox-fakekey"
select BR2_PACKAGE_XLIB_LIBXTST
+ help
+ Library for simulating key press events under X11.
diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
index 480e6fe..e50a543 100644
--- a/package/matchbox/matchbox-lib/Config.in
+++ b/package/matchbox/matchbox-lib/Config.in
@@ -1,2 +1,4 @@
config BR2_PACKAGE_MATCHBOX_LIB
- bool
+ bool "matchbox-lib"
+ help
+ Matchbox common functionality library.
diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
index 92a1241..744e2b6 100644
--- a/package/matchbox/matchbox-startup-monitor/Config.in
+++ b/package/matchbox/matchbox-startup-monitor/Config.in
@@ -1,3 +1,5 @@
config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
- bool
+ bool "matchbox-startup-monitor"
select BR2_PACKAGE_STARTUP_NOTIFICATION
+ help
+ Matchbox Panel Startup Monitor Applet.
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (17 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:28 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing Yann E. MORIN
` (11 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 2d30ca0..5bd2587 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -35,6 +35,13 @@ else
MATCHBOX_CONF_OPTS += --disable-startup-notification
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
+MATCHBOX_CONF_OPTS += --enable-session
+MATCHBOX_DEPENDENCIES += xlib_libSM
+else
+MATCHBOX_CONF_OPTS += --disable-session
+endif
+
$(eval $(autotools-package))
# After we called a package infra, w ecan include more files
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (18 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:29 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 21/30] package/matchbox: make it a menu Yann E. MORIN
` (10 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Support for /compositing/ requires Xcomposite, Xfixes, Xdamage and
Xrender, as can be seen in the configure.ac. And it is optional.
Fix that by removing 'select' in Config.in, and chcking all four
dependencies in the .mk.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 1 -
package/matchbox/matchbox.mk | 13 ++++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index e58aaf2..39eb616 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_MATCHBOX
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
help
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 5bd2587..be94414 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -16,12 +16,15 @@ MATCHBOX_CONF_OPTS = --enable-expat
# Workaround bug in configure script
MATCHBOX_CONF_ENV = expat=yes
-ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
-ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy)
MATCHBOX_CONF_OPTS += --enable-composite
-MATCHBOX_DEPENDENCIES += xlib_libXcomposite
-MATCHBOX_DEPENDENCIES += xlib_libXpm
-endif
+MATCHBOX_DEPENDENCIES += \
+ xlib_libXcomposite \
+ xlib_libXfixes \
+ xlib_libXdamage \
+ xlib_libXrender
+else
+MATCHBOX_CONF_OPTS += --disable-composite
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 21/30] package/matchbox: make it a menu
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (19 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:32 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing Yann E. MORIN
` (9 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
We're about to add a few more options, so it now warrants a menu for
itself.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 39eb616..9d8d060 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_MATCHBOX
+menuconfig BR2_PACKAGE_MATCHBOX
bool "matchbox"
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork()
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (20 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 21/30] package/matchbox: make it a menu Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:31 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies Yann E. MORIN
` (8 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Building with the experimental support for compositing is broken:
/home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o
toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o
select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o
list.o stack.o composite-engine.o session.o mbtheme.o xml.o
-lmb -lX11
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lXext -lXcomposite -lXdamage -lXfixes -lXrender
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lX11 -lexpat
-L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
-lXfixes
composite-engine.o: In function `gaussian':
/home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
undefined reference to `exp'
That's because it forgets to link with -lm.
However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as
it still does not link with -lm at all.
Furthermore, the package does not autoreconf, since it is missing the
gconf m4 macros, and Buildroot does not have a package for gconf, hence
we can not even patch Makefile.am and autoreconf.
Patching Makefile.in (in addition to .am) could be a solution, but
support for compositing is explicitly marked as being experimental.
So, just forcibly disable it altogether.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox.mk | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index be94414..4ec3fb5 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
MATCHBOX_LICENSE_FILES = COPYING
MATCHBOX_DEPENDENCIES = matchbox-lib
-MATCHBOX_CONF_OPTS = --enable-expat
+MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
# Workaround bug in configure script
MATCHBOX_CONF_ENV = expat=yes
-ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy)
-MATCHBOX_CONF_OPTS += --enable-composite
-MATCHBOX_DEPENDENCIES += \
- xlib_libXcomposite \
- xlib_libXfixes \
- xlib_libXdamage \
- xlib_libXrender
-else
-MATCHBOX_CONF_OPTS += --disable-composite
-endif
-
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
MATCHBOX_DEPENDENCIES += xlib_libXft
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (21 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:41 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo Yann E. MORIN
` (7 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
xlib-libXft is only needed when building a 'standalone' matchbox, which
means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone
mode (and probably won't, as even upstream says it is ugly, by lack of
theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for
which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not
building either standalone modes; drop xlib-libXext.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 1 -
package/matchbox/matchbox.mk | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 9d8d060..fa186e9 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
help
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 4ec3fb5..bce9520 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
MATCHBOX_LICENSE_FILES = COPYING
MATCHBOX_DEPENDENCIES = matchbox-lib
-MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
+MATCHBOX_CONF_OPTS = \
+ --enable-expat \
+ --disable-composite \
+ --disable-standalone \
+ --disable-standalone-xft
# Workaround bug in configure script
MATCHBOX_CONF_ENV = expat=yes
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (22 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:45 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected Yann E. MORIN
` (6 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
We usually explicitly enforce disabling optional support when it is
possible.
Do so for Cairo.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 2017730..368a883 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -24,6 +24,7 @@ ifeq ($(BR2_PACKAGE_CAIRO),y)
MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
else
+MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (23 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 20:44 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 26/30] package/matchbox: wrap long lines Yann E. MORIN
` (5 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-common/matchbox-common.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index da6bec7..038dd59 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -14,6 +14,8 @@ MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders
+else
+MATCHBOX_COMMON_CONF_OPTS += --disable-pda-folders
endif
$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox)
@ 2015-04-22 18:09 Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package Yann E. MORIN
` (30 more replies)
0 siblings, 31 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Hello All!
This series is an attempt at cleaning up the matchbox packages.
Currently, the matchbox pckages are in a dire situation, where some
package do not even have a corresponding BR2_PACKAGE_FOO option, but are
nonetheless build dependencies ones of others.
Also, some support code has been bit-rotting and is not even buildable
today, ike support for compositing, which simply FTBFS.
Finally, some dependencies are incorrect. For example, there are build
dependencies not expressed in the Kconfig (not even counting the missing
Kconfig entries for packages), or are entirely wrong.
So, this series aims at fixing all of this. And add a little bit of
extra features we're currently missing. Not everything that is possible
with matchbox has been handled, though, like support for NLS.
The series is split into multiple parts;
- patches 1-9 make all packages real packages, i.e. with proper
Kconfig options. No functionality change.
- patches 10-13 do a little eye-candy cleanups. No functionality
change.
- patches 14-17 fixes dependencies. No functionality change done on
purpose, except because of added proper dependency tracking.
- patch 18 stands out alone, a bit of eye-candy to add prompts for
previously prompt-less packages. No functionality change.
- patches 19-30 are not really sorted. They ar ea mix of fixes,
eye-candy and the few new features.
This has been build-tested only, with about every combinations possible
excercised, for ARM. No run-time testing has been done, though.
Enjoy! ;-)
Regards,
Yann E. MORIN.
The following changes since commit d3230923e62f57cdefa90b5ffb9760f39c94718e:
package/shairport-sync: bump to version 2.2.3 (2015-04-22 15:07:55 +0200)
are available in the git repository at:
git://git.busybox.net/~ymorin/git/buildroot yem/matchbox
for you to fetch changes up to 3de1b4334c76469f95d791d578f769831ab2f3a5:
package/matchbox-panel: fix WiFi monitoring (2015-04-22 19:45:03 +0200)
----------------------------------------------------------------
Yann E. MORIN (30):
package/matchbox: make matchbox-lib a real package
package/matchbox: make matchbox-wm a real package
package/matchbox-wm: drop useless commented options
package/matchbox: make matchbox-panel a real package
package/matchbox: make matchbox-desktop a real package
package/matchbox: make matchbox-common a real package
package/matchbox: make matchbox-fakekey a real package
package/matchbox: make matchbox-keyboard a real package
package/matchbox: make match-startup-monitor a real package
package/matchbox: remove superfluous conditional includes
package/matchbox: point to new home
package/matchbox: get rid of intermediate non-package matchbox
package/matchbox: fix option prompts
package/matchbox-common: fix dependencies
package/matchbox-common: break dependency chain for display
package/matchbox-fakekey: add missing dependency
package/matchbox-startup-monitor: add misisng dependency
package/matchbox: finally add prompts to all sub-packages
package/matchbox: enable support for the Xsession manager
package/matchbox: cleanup handling of support for compositing
package/matchbox: make it a menu
package/matchbox: forcibly disable support for compositing
package/matchbox: drop useless dependencies
package/matchbox-keyboard: enforce disabling support for cairo
package/matchbox-common: explicitly disable PDA folders when not selected
package/matchbox: wrap long lines
package/matchbox: xlib-libXcursor is an optional dependency
package/matchbox-panel: add option to use ACPI for the battery applet
package/matchbox-panel: add support for dnotify
package/matchbox-panel: fix WiFi monitoring
.../{matchbox-wm => }/0001-defaulttheme.patch | 0
package/matchbox/Config.in | 45 +++++--------------
package/matchbox/matchbox-common/Config.in | 14 ++++++
.../matchbox/matchbox-common/matchbox-common.mk | 2 +
package/matchbox/matchbox-desktop/Config.in | 5 +++
package/matchbox/matchbox-fakekey/Config.in | 5 +++
package/matchbox/matchbox-keyboard/Config.in | 7 +++
.../matchbox-keyboard/matchbox-keyboard.mk | 4 +-
package/matchbox/matchbox-lib/Config.in | 4 ++
package/matchbox/matchbox-lib/matchbox-lib.mk | 3 +-
package/matchbox/matchbox-panel/Config.in | 28 ++++++++++++
package/matchbox/matchbox-panel/matchbox-panel.mk | 18 ++++++--
.../matchbox/matchbox-startup-monitor/Config.in | 5 +++
package/matchbox/matchbox-wm/matchbox-wm.mk | 41 ------------------
.../matchbox-wm.hash => matchbox.hash} | 0
package/matchbox/matchbox.mk | 50 ++++++++++++++++++++--
16 files changed, 148 insertions(+), 83 deletions(-)
rename package/matchbox/{matchbox-wm => }/0001-defaulttheme.patch (100%)
create mode 100644 package/matchbox/matchbox-common/Config.in
create mode 100644 package/matchbox/matchbox-desktop/Config.in
create mode 100644 package/matchbox/matchbox-fakekey/Config.in
create mode 100644 package/matchbox/matchbox-keyboard/Config.in
create mode 100644 package/matchbox/matchbox-lib/Config.in
create mode 100644 package/matchbox/matchbox-panel/Config.in
create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in
delete mode 100644 package/matchbox/matchbox-wm/matchbox-wm.mk
rename package/matchbox/{matchbox-wm/matchbox-wm.hash => matchbox.hash} (100%)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 26/30] package/matchbox: wrap long lines
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (24 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency Yann E. MORIN
` (4 subsequent siblings)
30 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 3 ++-
package/matchbox/matchbox-lib/matchbox-lib.mk | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 368a883..4d8359b 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -15,7 +15,8 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
- $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh
+ $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh \
+ $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh
endef
MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 3b697bb..d43e2b8 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -15,7 +15,8 @@ MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
+ $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \
+ $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
endef
MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (25 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 26/30] package/matchbox: wrap long lines Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 21:02 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet Yann E. MORIN
` (3 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
matchbox selects xlib-libXcursor, but does not build-depend on it.
But xlib-libXcursor is only an optional dependency.
Fix that by removing the select, and properly build-depend on it when
it is enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/Config.in | 1 -
package/matchbox/matchbox.mk | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index fa186e9..ad68718 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_MATCHBOX_LIB
help
Matchbox is an Open Source base environment for the X Window
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index bce9520..d2c3451 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -38,6 +38,10 @@ else
MATCHBOX_CONF_OPTS += --disable-session
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+MATCHBOX_DEPENDENCIES += xlib_libXcursor
+endif
+
$(eval $(autotools-package))
# After we called a package infra, w ecan include more files
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (26 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 21:39 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify Yann E. MORIN
` (2 subsequent siblings)
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
It is possible to use ACPI to monitor the battery with the battery
min-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 id not built.
What is a pity is that there is no way to explicitly enable or disable
the applet; it only relies on auto-detection... :-(
So, add an option to enable use of ACPI, visible only on architectures
that have at least some hope of having ACPI support.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
2 files changed, 21 insertions(+)
diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
index 47bd10a..93241f0 100644
--- a/package/matchbox/matchbox-panel/Config.in
+++ b/package/matchbox/matchbox-panel/Config.in
@@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL
help
A flexible always present 'window bar' for holding
application launchers.
+
+if BR2_PACKAGE_MATCHBOX_PANEL
+
+config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
+ bool "use ACPI for battery mini-applet"
+ depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
+ help
+ Use ACPI to monitor the battery.
+
+ Say 'y' here to use ACPI to monitor the battery.
+ If you say 'n', then APM will be used if available;
+ otherwise the battery monitor mini-applet is not
+ built.
+
+endif # BR2_PACKAGE_MATCHBOX_PANEL
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index f7d699b..aa9018c 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -20,6 +20,12 @@ else
MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
endif
+ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y)
+MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux
+else
+MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
+endif
+
ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (27 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 21:44 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring Yann E. MORIN
2015-04-23 21:24 ` [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Arnout Vandecappelle
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
Using dnotify, matchbox-panel can automatically reload its menu.
dnotify requires a kernel >=2.4, which we can consider to be
virtually for granted.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-panel/Config.in | 7 +++++++
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
index 93241f0..6daf2db 100644
--- a/package/matchbox/matchbox-panel/Config.in
+++ b/package/matchbox/matchbox-panel/Config.in
@@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
otherwise the battery monitor mini-applet is not
built.
+config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY
+ bool "use dnotify"
+ help
+ Using dnotify allows matchbox-panel to automatically reload
+ its menu when entries are changed (e.g. when a new application
+ is installed).
+
endif # BR2_PACKAGE_MATCHBOX_PANEL
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index aa9018c..dedbab6 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -26,6 +26,12 @@ else
MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
endif
+ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y)
+MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify
+else
+MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify
+endif
+
ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (28 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify Yann E. MORIN
@ 2015-04-22 18:09 ` Yann E. MORIN
2015-05-01 21:45 ` Arnout Vandecappelle
2015-04-23 21:24 ` [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Arnout Vandecappelle
30 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-22 18:09 UTC (permalink / raw)
To: buildroot
matchbox-panel can build a simple applet to monitor the WiFi. For that,
it tries to see if libiwl is available; if so, WiFi monitoring is
enabled, otherwise it is disabled; there is not option to explicitly
enable or disable it.
Currently, matchbox-panel depends on the wireless-tools package.
However, that's not enough, since the library will only be installed if
explictly enabled in the menuconfig *and* this is not a static build.
Change the dependency to be on the library, not the package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/matchbox/matchbox-panel/matchbox-panel.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index dedbab6..455ae34 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -32,7 +32,7 @@ else
MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify
endif
-ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
+ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y)
MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 11/30] package/matchbox: point to new home
2015-04-22 18:09 ` [Buildroot] [PATCH 11/30] package/matchbox: point to new home Yann E. MORIN
@ 2015-04-23 8:58 ` Alexandre Belloni
2015-04-23 16:38 ` Yann E. MORIN
2015-04-23 22:01 ` Arnout Vandecappelle
1 sibling, 1 reply; 82+ messages in thread
From: Alexandre Belloni @ 2015-04-23 8:58 UTC (permalink / raw)
To: buildroot
On 22/04/2015 at 20:09:22 +0200, Yann E. MORIN wrote :
> The new home of the matchbox project is with the Yocto
> project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever
> that is. ;-)
>
I'm not sure that kind of comments will make people take buildroot
seriously. The correct behaviour would be to actually be happy that
someone is willing to maintain matchbox.
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 2f9b73d..891ac95 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX
> handhelds, set-top boxes, kiosks and anything else for which
> screen space, input mechanisms or system resources are limited.
>
> - http://matchbox-project.org/
> + https://www.yoctoproject.org/tools-resources/projects/matchbox
>
> if BR2_PACKAGE_MATCHBOX
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 11/30] package/matchbox: point to new home
2015-04-23 8:58 ` Alexandre Belloni
@ 2015-04-23 16:38 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-23 16:38 UTC (permalink / raw)
To: buildroot
Alexandre, All,
On 2015-04-23 10:58 +0200, Alexandre Belloni spake thusly:
> On 22/04/2015 at 20:09:22 +0200, Yann E. MORIN wrote :
> > The new home of the matchbox project is with the Yocto
> > project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever
> > that is. ;-)
>
> I'm not sure that kind of comments will make people take buildroot
> seriously. The correct behaviour would be to actually be happy that
> someone is willing to maintain matchbox.
OK, so that was probably not that good a joke, in retrospect, even with
the smiley... Yes, it may have been a little bit too sarcastic. I'll
withdraw in the next respin. Thanks for the lecture.
And yes, I'm happy matchbox as well as many other things are hosted
there. But matchbox being 'maintained' is another story: most every
matchbox packages have not been touched for 2 years, the only exception
being a commit and its prompt revert. Still, that's not a reproach
whatsoever: matchbox is dead, and that's part of life for a package;
nothing wrong with that.
Thanks for the feedback. :-)
Regards,
Yann E. MORIN.
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> > package/matchbox/Config.in | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> > index 2f9b73d..891ac95 100644
> > --- a/package/matchbox/Config.in
> > +++ b/package/matchbox/Config.in
> > @@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX
> > handhelds, set-top boxes, kiosks and anything else for which
> > screen space, input mechanisms or system resources are limited.
> >
> > - http://matchbox-project.org/
> > + https://www.yoctoproject.org/tools-resources/projects/matchbox
> >
> > if BR2_PACKAGE_MATCHBOX
> >
> > --
> > 1.9.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> Alexandre Belloni, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox)
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
` (29 preceding siblings ...)
2015-04-22 18:09 ` [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring Yann E. MORIN
@ 2015-04-23 21:24 ` Arnout Vandecappelle
2015-04-23 21:27 ` Yann E. MORIN
30 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:24 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Hello All!
>
> This series is an attempt at cleaning up the matchbox packages.
Hi Yann,
Kudos for this!
>
> Currently, the matchbox pckages are in a dire situation, where some
> package do not even have a corresponding BR2_PACKAGE_FOO option, but are
> nonetheless build dependencies ones of others.
>
> Also, some support code has been bit-rotting and is not even buildable
> today, ike support for compositing, which simply FTBFS.
>
> Finally, some dependencies are incorrect. For example, there are build
> dependencies not expressed in the Kconfig (not even counting the missing
> Kconfig entries for packages), or are entirely wrong.
>
> So, this series aims at fixing all of this. And add a little bit of
> extra features we're currently missing. Not everything that is possible
> with matchbox has been handled, though, like support for NLS.
>
> The series is split into multiple parts;
>
> - patches 1-9 make all packages real packages, i.e. with proper
> Kconfig options. No functionality change.
One overall remark to this part of the series: I'd move them directly under
package/ which is supposed to be the standard way of doing things now, so get
rid of the matchbox subdirectory. That's also the way it works with Kodi BTW.
Regards,
Arnout
>
> - patches 10-13 do a little eye-candy cleanups. No functionality
> change.
>
> - patches 14-17 fixes dependencies. No functionality change done on
> purpose, except because of added proper dependency tracking.
>
> - patch 18 stands out alone, a bit of eye-candy to add prompts for
> previously prompt-less packages. No functionality change.
>
> - patches 19-30 are not really sorted. They ar ea mix of fixes,
> eye-candy and the few new features.
>
> This has been build-tested only, with about every combinations possible
> excercised, for ARM. No run-time testing has been done, though.
>
> Enjoy! ;-)
>
> Regards,
> Yann E. MORIN.
[snip]
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox)
2015-04-23 21:24 ` [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Arnout Vandecappelle
@ 2015-04-23 21:27 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-23 21:27 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-23 23:24 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
[--SNIP--]
> > The series is split into multiple parts;
> >
> > - patches 1-9 make all packages real packages, i.e. with proper
> > Kconfig options. No functionality change.
>
> One overall remark to this part of the series: I'd move them directly under
> package/ which is supposed to be the standard way of doing things now, so get
> rid of the matchbox subdirectory. That's also the way it works with Kodi BTW.
Right, I can do that (though that will be a hell of a rebase!).
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package Yann E. MORIN
@ 2015-04-23 21:29 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:29 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, the matchbox package is using weird, legacy constrcuts to
> build its different parts.
>
> Notably, it adds matchbox-lib to the list of packages to build, even
> though it is not a real package since it does not have a Kconfig entry.
>
> Fix that:
> - add a Kconfig entry for matchbox-lib
> - select it from the top-level matchbox package
>
> Note that matchbox-common already depends on matchbox-lib.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Some suggestions below for handling the one-level-less approach.
> ---
> package/matchbox/Config.in | 3 +++
> package/matchbox/matchbox-lib/Config.in | 2 ++
> package/matchbox/matchbox.mk | 2 +-
> 3 files changed, 6 insertions(+), 1 deletion(-)
> create mode 100644 package/matchbox/matchbox-lib/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 7867ae3..70cc168 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -7,6 +7,7 @@ config BR2_PACKAGE_MATCHBOX
> select BR2_PACKAGE_XLIB_LIBXEXT
> select BR2_PACKAGE_XLIB_LIBXDAMAGE
> select BR2_PACKAGE_XLIB_LIBXCURSOR
> + select BR2_PACKAGE_MATCHBOX_LIB
> help
> Matchbox is an Open Source base environment for the X Window
> System running on non-desktop embedded platforms such as
> @@ -17,6 +18,8 @@ config BR2_PACKAGE_MATCHBOX
>
> if BR2_PACKAGE_MATCHBOX
>
> +source "package/matchbox/matchbox-lib/Config.in"
This should obviously move to package/Config.in, and the condition should be
copied.
Regards,
Arnout
> +
> config BR2_PACKAGE_MATCHBOX_PANEL
> bool "Matchbox Panel"
> help
> diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
> new file mode 100644
> index 0000000..480e6fe
> --- /dev/null
> +++ b/package/matchbox/matchbox-lib/Config.in
> @@ -0,0 +1,2 @@
> +config BR2_PACKAGE_MATCHBOX_LIB
> + bool
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index fe1a7db..e367df2 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -1,4 +1,4 @@
> ifeq ($(BR2_PACKAGE_MATCHBOX),y)
> include $(sort $(wildcard package/matchbox/*/*.mk))
> -PACKAGES += matchbox-lib matchbox-wm
> +PACKAGES += matchbox-wm
> endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options
2015-04-22 18:09 ` [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options Yann E. MORIN
@ 2015-04-23 21:33 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:33 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
I'd put this one at the beginning of the series though since it's the simplest
of them all and can be accepted quickly. Perhaps it's already gone by the time
you respin :-).
Regards,
Arnout
> ---
> package/matchbox/matchbox-wm/matchbox-wm.mk | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
> index 16f1417..da9efd7 100644
> --- a/package/matchbox/matchbox-wm/matchbox-wm.mk
> +++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
> @@ -25,10 +25,7 @@ endif
> endif
>
> ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
> -#MATCHBOX_WM_OPTS += --enable-standalone-xft
> MATCHBOX_WM_DEPENDENCIES += xlib_libXft
> -else
> -#MATCHBOX_WM_OPTS += --disable-standalone-xft
> endif
>
> ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm " Yann E. MORIN
@ 2015-04-23 21:35 ` Arnout Vandecappelle
2015-04-23 21:44 ` Arnout Vandecappelle
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:35 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Similarly to what we just did for matchbox-lib, we make matchbox-wm a
> real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(on condition that it goes to package/matchbox-wm)
Regards,
Arnout
> ---
> package/matchbox/Config.in | 2 ++
> package/matchbox/matchbox-wm/Config.in | 3 +++
> package/matchbox/matchbox.mk | 1 -
> 3 files changed, 5 insertions(+), 1 deletion(-)
> create mode 100644 package/matchbox/matchbox-wm/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 70cc168..15b1017 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX
> select BR2_PACKAGE_XLIB_LIBXDAMAGE
> select BR2_PACKAGE_XLIB_LIBXCURSOR
> select BR2_PACKAGE_MATCHBOX_LIB
> + select BR2_PACKAGE_MATCHBOX_WM
> help
> Matchbox is an Open Source base environment for the X Window
> System running on non-desktop embedded platforms such as
> @@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX
> if BR2_PACKAGE_MATCHBOX
>
> source "package/matchbox/matchbox-lib/Config.in"
> +source "package/matchbox/matchbox-wm/Config.in"
>
> config BR2_PACKAGE_MATCHBOX_PANEL
> bool "Matchbox Panel"
> diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
> new file mode 100644
> index 0000000..6ad5dfc
> --- /dev/null
> +++ b/package/matchbox/matchbox-wm/Config.in
> @@ -0,0 +1,3 @@
> +config BR2_PACKAGE_MATCHBOX_WM
> + bool
> + select BR2_PACKAGE_MATCHBOX_LIB
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index e367df2..17d89d8 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -1,4 +1,3 @@
> ifeq ($(BR2_PACKAGE_MATCHBOX),y)
> include $(sort $(wildcard package/matchbox/*/*.mk))
> -PACKAGES += matchbox-wm
> endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package Yann E. MORIN
@ 2015-04-23 21:36 ` Arnout Vandecappelle
2015-04-23 21:46 ` Arnout Vandecappelle
1 sibling, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:36 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-panel is treated as if it were an option of the
> matchbox package.
>
> But that's not true, since it is a real package all by itself, with its
> own archive and its own buildsystem.
>
> So, make it a real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(on condition that it goes to matchbox/matchbox-panel)
Regards,
Arnout
> ---
> package/matchbox/Config.in | 7 +------
> package/matchbox/matchbox-panel/Config.in | 6 ++++++
> 2 files changed, 7 insertions(+), 6 deletions(-)
> create mode 100644 package/matchbox/matchbox-panel/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 15b1017..e791cea 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX
>
> source "package/matchbox/matchbox-lib/Config.in"
> source "package/matchbox/matchbox-wm/Config.in"
> -
> -config BR2_PACKAGE_MATCHBOX_PANEL
> - bool "Matchbox Panel"
> - help
> - A flexible always present 'window bar' for holding
> - application launchers.
> +source "package/matchbox/matchbox-panel/Config.in"
>
> config BR2_PACKAGE_MATCHBOX_DESKTOP
> bool "Matchbox Desktop"
> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> new file mode 100644
> index 0000000..e3daaf5
> --- /dev/null
> +++ b/package/matchbox/matchbox-panel/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_MATCHBOX_PANEL
> + bool "Matchbox Panel"
> + select BR2_PACKAGE_MATCHBOX_LIB
> + help
> + A flexible always present 'window bar' for holding
> + application launchers.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm a real package
2015-04-23 21:35 ` Arnout Vandecappelle
@ 2015-04-23 21:44 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:44 UTC (permalink / raw)
To: buildroot
On 04/23/15 23:35, Arnout Vandecappelle wrote:
> On 04/22/15 20:09, Yann E. MORIN wrote:
>> Similarly to what we just did for matchbox-lib, we make matchbox-wm a
>> real package.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> (on condition that it goes to package/matchbox-wm)
As discussed on IRC: moving all matchbox packages one directory up is for a
later patch, so this patch is good as it is.
Regards,
Arnout
>
> Regards,
> Arnout
>
>> ---
>> package/matchbox/Config.in | 2 ++
>> package/matchbox/matchbox-wm/Config.in | 3 +++
>> package/matchbox/matchbox.mk | 1 -
>> 3 files changed, 5 insertions(+), 1 deletion(-)
>> create mode 100644 package/matchbox/matchbox-wm/Config.in
>>
>> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
>> index 70cc168..15b1017 100644
>> --- a/package/matchbox/Config.in
>> +++ b/package/matchbox/Config.in
>> @@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX
>> select BR2_PACKAGE_XLIB_LIBXDAMAGE
>> select BR2_PACKAGE_XLIB_LIBXCURSOR
>> select BR2_PACKAGE_MATCHBOX_LIB
>> + select BR2_PACKAGE_MATCHBOX_WM
>> help
>> Matchbox is an Open Source base environment for the X Window
>> System running on non-desktop embedded platforms such as
>> @@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX
>> if BR2_PACKAGE_MATCHBOX
>>
>> source "package/matchbox/matchbox-lib/Config.in"
>> +source "package/matchbox/matchbox-wm/Config.in"
>>
>> config BR2_PACKAGE_MATCHBOX_PANEL
>> bool "Matchbox Panel"
>> diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
>> new file mode 100644
>> index 0000000..6ad5dfc
>> --- /dev/null
>> +++ b/package/matchbox/matchbox-wm/Config.in
>> @@ -0,0 +1,3 @@
>> +config BR2_PACKAGE_MATCHBOX_WM
>> + bool
>> + select BR2_PACKAGE_MATCHBOX_LIB
>> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
>> index e367df2..17d89d8 100644
>> --- a/package/matchbox/matchbox.mk
>> +++ b/package/matchbox/matchbox.mk
>> @@ -1,4 +1,3 @@
>> ifeq ($(BR2_PACKAGE_MATCHBOX),y)
>> include $(sort $(wildcard package/matchbox/*/*.mk))
>> -PACKAGES += matchbox-wm
>> endif
>>
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package Yann E. MORIN
2015-04-23 21:36 ` Arnout Vandecappelle
@ 2015-04-23 21:46 ` Arnout Vandecappelle
2015-04-23 21:47 ` Arnout Vandecappelle
1 sibling, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:46 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-panel is treated as if it were an option of the
> matchbox package.
>
> But that's not true, since it is a real package all by itself, with its
> own archive and its own buildsystem.
>
> So, make it a real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/Config.in | 7 +------
> package/matchbox/matchbox-panel/Config.in | 6 ++++++
> 2 files changed, 7 insertions(+), 6 deletions(-)
> create mode 100644 package/matchbox/matchbox-panel/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 15b1017..e791cea 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX
>
> source "package/matchbox/matchbox-lib/Config.in"
> source "package/matchbox/matchbox-wm/Config.in"
> -
> -config BR2_PACKAGE_MATCHBOX_PANEL
> - bool "Matchbox Panel"
> - help
> - A flexible always present 'window bar' for holding
> - application launchers.
> +source "package/matchbox/matchbox-panel/Config.in"
>
> config BR2_PACKAGE_MATCHBOX_DESKTOP
> bool "Matchbox Desktop"
> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> new file mode 100644
> index 0000000..e3daaf5
> --- /dev/null
> +++ b/package/matchbox/matchbox-panel/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_MATCHBOX_PANEL
> + bool "Matchbox Panel"
Actually, to match our style, that should be "matchbox-panel". You can choose
if that is in this patch or in a mass cleanup patch later in the series.
Regards,
Arnout
> + select BR2_PACKAGE_MATCHBOX_LIB
> + help
> + A flexible always present 'window bar' for holding
> + application launchers.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package
2015-04-23 21:46 ` Arnout Vandecappelle
@ 2015-04-23 21:47 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:47 UTC (permalink / raw)
To: buildroot
On 04/23/15 23:46, Arnout Vandecappelle wrote:
> On 04/22/15 20:09, Yann E. MORIN wrote:
>> Currently, matchbox-panel is treated as if it were an option of the
>> matchbox package.
>>
>> But that's not true, since it is a real package all by itself, with its
>> own archive and its own buildsystem.
>>
>> So, make it a real package.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> ---
>> package/matchbox/Config.in | 7 +------
>> package/matchbox/matchbox-panel/Config.in | 6 ++++++
>> 2 files changed, 7 insertions(+), 6 deletions(-)
>> create mode 100644 package/matchbox/matchbox-panel/Config.in
>>
>> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
>> index 15b1017..e791cea 100644
>> --- a/package/matchbox/Config.in
>> +++ b/package/matchbox/Config.in
>> @@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX
>>
>> source "package/matchbox/matchbox-lib/Config.in"
>> source "package/matchbox/matchbox-wm/Config.in"
>> -
>> -config BR2_PACKAGE_MATCHBOX_PANEL
>> - bool "Matchbox Panel"
>> - help
>> - A flexible always present 'window bar' for holding
>> - application launchers.
>> +source "package/matchbox/matchbox-panel/Config.in"
>>
>> config BR2_PACKAGE_MATCHBOX_DESKTOP
>> bool "Matchbox Desktop"
>> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
>> new file mode 100644
>> index 0000000..e3daaf5
>> --- /dev/null
>> +++ b/package/matchbox/matchbox-panel/Config.in
>> @@ -0,0 +1,6 @@
>> +config BR2_PACKAGE_MATCHBOX_PANEL
>> + bool "Matchbox Panel"
>
> Actually, to match our style, that should be "matchbox-panel". You can choose
> if that is in this patch or in a mass cleanup patch later in the series.
Argh, it already is part of a later patch. Sorry for the noise...
Regards,
Arnout
>
> Regards,
> Arnout
>
>> + select BR2_PACKAGE_MATCHBOX_LIB
>> + help
>> + A flexible always present 'window bar' for holding
>> + application launchers.
>>
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop " Yann E. MORIN
@ 2015-04-23 21:49 ` Arnout Vandecappelle
2015-04-24 17:37 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:49 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-desktop is treated as if it were an option of the
> matchbox package.
>
> But that's not true, since it is a real package all by itself, with its
> own archive and its own buildsystem.
>
> So, make it a real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
One remark below...
> ---
> package/matchbox/Config.in | 7 +------
> package/matchbox/matchbox-desktop/Config.in | 5 +++++
> 2 files changed, 6 insertions(+), 6 deletions(-)
> create mode 100644 package/matchbox/matchbox-desktop/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index e791cea..39aff3c 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX
> source "package/matchbox/matchbox-lib/Config.in"
> source "package/matchbox/matchbox-wm/Config.in"
> source "package/matchbox/matchbox-panel/Config.in"
> -
> -config BR2_PACKAGE_MATCHBOX_DESKTOP
> - bool "Matchbox Desktop"
> - select BR2_PACKAGE_ZLIB
> - help
> - A PDA style application launcher or 'item browser'.
> +source "package/matchbox/matchbox-desktop/Config.in"
Note that things should be sorted alphabetically. But I think that can better
be combined with the one-directory-up patch.
Regards,
Arnout
>
> config BR2_PACKAGE_MATCHBOX_COMMON
> bool "Matchbox session common files"
> diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox/matchbox-desktop/Config.in
> new file mode 100644
> index 0000000..c9fd196
> --- /dev/null
> +++ b/package/matchbox/matchbox-desktop/Config.in
> @@ -0,0 +1,5 @@
> +config BR2_PACKAGE_MATCHBOX_DESKTOP
> + bool "Matchbox Desktop"
> + select BR2_PACKAGE_ZLIB
> + help
> + A PDA style application launcher or 'item browser'.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common " Yann E. MORIN
@ 2015-04-23 21:52 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:52 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-common is treated as if it were an option of the
> matchbox package.
>
> But that's not true, since it is a real package all by itself, with its
> own archive and its own buildsystem.
>
> So, make it a real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/Config.in | 11 +----------
> package/matchbox/matchbox-common/Config.in | 9 +++++++++
> 2 files changed, 10 insertions(+), 10 deletions(-)
> create mode 100644 package/matchbox/matchbox-common/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 39aff3c..ead2649 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -23,16 +23,7 @@ source "package/matchbox/matchbox-lib/Config.in"
> source "package/matchbox/matchbox-wm/Config.in"
> source "package/matchbox/matchbox-panel/Config.in"
> source "package/matchbox/matchbox-desktop/Config.in"
> -
> -config BR2_PACKAGE_MATCHBOX_COMMON
> - bool "Matchbox session common files"
> - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
> - help
> - Common desktop folders and matchbox-session script.
> -
> -config BR2_PACKAGE_MATCHBOX_COMMON_PDA
> - bool "PDA style desktop folders"
> - depends on BR2_PACKAGE_MATCHBOX_COMMON
> +source "package/matchbox/matchbox-common/Config.in"
>
> config BR2_PACKAGE_MATCHBOX_KEYBOARD
> bool "Matchbox Virtual Keyboard"
> diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
> new file mode 100644
> index 0000000..7d22d05
> --- /dev/null
> +++ b/package/matchbox/matchbox-common/Config.in
> @@ -0,0 +1,9 @@
> +config BR2_PACKAGE_MATCHBOX_COMMON
> + bool "Matchbox session common files"
> + depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
> + help
> + Common desktop folders and matchbox-session script.
> +
> +config BR2_PACKAGE_MATCHBOX_COMMON_PDA
> + bool "PDA style desktop folders"
> + depends on BR2_PACKAGE_MATCHBOX_COMMON
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey " Yann E. MORIN
@ 2015-04-23 21:54 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:54 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-fakekey is missing a Kconfig entry, but is so far
> solely a build-time dependency of matchbox-keyboard.
>
> So, make it a real package, and select it from matchbox-keyboard.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/Config.in | 2 ++
> package/matchbox/matchbox-fakekey/Config.in | 2 ++
> 2 files changed, 4 insertions(+)
> create mode 100644 package/matchbox/matchbox-fakekey/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index ead2649..8d4ebc7 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -24,11 +24,13 @@ source "package/matchbox/matchbox-wm/Config.in"
> source "package/matchbox/matchbox-panel/Config.in"
> source "package/matchbox/matchbox-desktop/Config.in"
> source "package/matchbox/matchbox-common/Config.in"
> +source "package/matchbox/matchbox-fakekey/Config.in"
>
> config BR2_PACKAGE_MATCHBOX_KEYBOARD
> bool "Matchbox Virtual Keyboard"
> select BR2_PACKAGE_XLIB_LIBXTST
> select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
> + select BR2_PACKAGE_MATCHBOX_FAKEKEY
> help
> Virtual Keyboard
>
> diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
> new file mode 100644
> index 0000000..334f3a2
> --- /dev/null
> +++ b/package/matchbox/matchbox-fakekey/Config.in
> @@ -0,0 +1,2 @@
> +config BR2_PACKAGE_MATCHBOX_FAKEKEY
> + bool
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard " Yann E. MORIN
@ 2015-04-23 21:55 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 21:55 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-keyboard is treated as if it were an option of the
> matchbox package.
>
> But that's not true, since it is a real package all by itself, with its
> own archive and its own buildsystem.
>
> So, make it a real package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/Config.in | 9 +--------
> package/matchbox/matchbox-keyboard/Config.in | 7 +++++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
> create mode 100644 package/matchbox/matchbox-keyboard/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 8d4ebc7..9b27d4d 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -25,13 +25,6 @@ source "package/matchbox/matchbox-panel/Config.in"
> source "package/matchbox/matchbox-desktop/Config.in"
> source "package/matchbox/matchbox-common/Config.in"
> source "package/matchbox/matchbox-fakekey/Config.in"
> -
> -config BR2_PACKAGE_MATCHBOX_KEYBOARD
> - bool "Matchbox Virtual Keyboard"
> - select BR2_PACKAGE_XLIB_LIBXTST
> - select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
> - select BR2_PACKAGE_MATCHBOX_FAKEKEY
> - help
> - Virtual Keyboard
> +source "package/matchbox/matchbox-keyboard/Config.in"
>
> endif
> diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox/matchbox-keyboard/Config.in
> new file mode 100644
> index 0000000..e017358
> --- /dev/null
> +++ b/package/matchbox/matchbox-keyboard/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_MATCHBOX_KEYBOARD
> + bool "Matchbox Virtual Keyboard"
> + select BR2_PACKAGE_XLIB_LIBXTST
> + select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
> + select BR2_PACKAGE_MATCHBOX_FAKEKEY
> + help
> + Virtual Keyboard
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor a real package
2015-04-22 18:09 ` [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor " Yann E. MORIN
@ 2015-04-23 22:00 ` Arnout Vandecappelle
2015-04-24 17:40 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 22:00 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-startup-monitor is missing a Kconfig entry, but is
^
> so far solely a build-time dependency of matchbox-panel.
>
> So, make it a real package, and only build-depend on it when enabled.
> Fix the condition to build-depend on it.
Update commit message according to my comment below.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/Config.in | 1 +
> package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++--
> package/matchbox/matchbox-startup-monitor/Config.in | 2 ++
> 3 files changed, 5 insertions(+), 2 deletions(-)
> create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 9b27d4d..2f9b73d 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -26,5 +26,6 @@ source "package/matchbox/matchbox-desktop/Config.in"
> source "package/matchbox/matchbox-common/Config.in"
> source "package/matchbox/matchbox-fakekey/Config.in"
> source "package/matchbox/matchbox-keyboard/Config.in"
> +source "package/matchbox/matchbox-startup-monitor/Config.in"
>
> endif
> diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> index d3efed9..f7d699b 100644
> --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> @@ -13,9 +13,9 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING
> MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
> MATCHBOX_PANEL_CONF_OPTS = --enable-expat
>
> -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
> +ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y)
> MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
> -MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
> +MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor
> else
> MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
> endif
> diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
> new file mode 100644
> index 0000000..4dd088f
> --- /dev/null
> +++ b/package/matchbox/matchbox-startup-monitor/Config.in
> @@ -0,0 +1,2 @@
> +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
> + bool
This changes behaviour: it used to be selected automatically when
startup-notification was selected. So you should add
default y if BR2_PACKAGE_STARTUP_NOTIFICATION
Of course, that's going to be reverted anyway when you later add a prompt to
this package, so perhaps it's not that important.
Regards,
Arnout
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes
2015-04-22 18:09 ` [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes Yann E. MORIN
@ 2015-04-23 22:01 ` Arnout Vandecappelle
2015-04-24 17:43 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 22:01 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Now that the matchbox package no longer forcibly add entries to the
> PACKAGES list, and entirely relies on having proper packages, we can
> safely include all matchbox sub-packages .mk files, and the pkg-infra
> will take care of building only those that are enabled.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This could already been done after patches 1 and 2.
Regards,
Arnout
> ---
> package/matchbox/matchbox.mk | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index 17d89d8..ae989b3 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -1,3 +1 @@
> -ifeq ($(BR2_PACKAGE_MATCHBOX),y)
> include $(sort $(wildcard package/matchbox/*/*.mk))
> -endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 11/30] package/matchbox: point to new home
2015-04-22 18:09 ` [Buildroot] [PATCH 11/30] package/matchbox: point to new home Yann E. MORIN
2015-04-23 8:58 ` Alexandre Belloni
@ 2015-04-23 22:01 ` Arnout Vandecappelle
1 sibling, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 22:01 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> The new home of the matchbox project is with the Yocto
> project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever
> that is. ;-)
I have no problem with this commit message :-)
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 2f9b73d..891ac95 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX
> handhelds, set-top boxes, kiosks and anything else for which
> screen space, input mechanisms or system resources are limited.
>
> - http://matchbox-project.org/
> + https://www.yoctoproject.org/tools-resources/projects/matchbox
>
> if BR2_PACKAGE_MATCHBOX
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts
2015-04-22 18:09 ` [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts Yann E. MORIN
@ 2015-04-23 22:26 ` Arnout Vandecappelle
2015-04-24 16:50 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 22:26 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Use the package names instead of some fancy human-readable strings. ;-)
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/Config.in | 2 +-
> package/matchbox/matchbox-common/Config.in | 4 ++--
> package/matchbox/matchbox-desktop/Config.in | 2 +-
> package/matchbox/matchbox-keyboard/Config.in | 2 +-
> package/matchbox/matchbox-panel/Config.in | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 7d06bb2..e58aaf2 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_MATCHBOX
> - bool "MatchBox Window Manager"
> + bool "matchbox"
Not so sure about this one... The upstream name is matchbox-window-manager, and
it is useful information that it's a window manager. OTOH that's already in the
comment right above it.
So in the end I'm OK either way.
Regards,
Arnout
> depends on BR2_PACKAGE_XORG7
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_FONTCONFIG
> diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
> index 7d22d05..f1c4ce3 100644
> --- a/package/matchbox/matchbox-common/Config.in
> +++ b/package/matchbox/matchbox-common/Config.in
> @@ -1,9 +1,9 @@
> config BR2_PACKAGE_MATCHBOX_COMMON
> - bool "Matchbox session common files"
> + bool "matchbox-common"
> depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
> help
> Common desktop folders and matchbox-session script.
>
> config BR2_PACKAGE_MATCHBOX_COMMON_PDA
> - bool "PDA style desktop folders"
> + bool "PDA style app folder"
> depends on BR2_PACKAGE_MATCHBOX_COMMON
> diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox/matchbox-desktop/Config.in
> index c9fd196..ed80c22 100644
> --- a/package/matchbox/matchbox-desktop/Config.in
> +++ b/package/matchbox/matchbox-desktop/Config.in
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_MATCHBOX_DESKTOP
> - bool "Matchbox Desktop"
> + bool "matchbox-desktop"
> select BR2_PACKAGE_ZLIB
> help
> A PDA style application launcher or 'item browser'.
> diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox/matchbox-keyboard/Config.in
> index e017358..056a255 100644
> --- a/package/matchbox/matchbox-keyboard/Config.in
> +++ b/package/matchbox/matchbox-keyboard/Config.in
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_MATCHBOX_KEYBOARD
> - bool "Matchbox Virtual Keyboard"
> + bool "matchbox-keyboard"
> select BR2_PACKAGE_XLIB_LIBXTST
> select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
> select BR2_PACKAGE_MATCHBOX_FAKEKEY
> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> index e3daaf5..47bd10a 100644
> --- a/package/matchbox/matchbox-panel/Config.in
> +++ b/package/matchbox/matchbox-panel/Config.in
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_MATCHBOX_PANEL
> - bool "Matchbox Panel"
> + bool "matchbox-panel"
> select BR2_PACKAGE_MATCHBOX_LIB
> help
> A flexible always present 'window bar' for holding
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox
2015-04-22 18:09 ` [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox Yann E. MORIN
@ 2015-04-23 22:27 ` Arnout Vandecappelle
2015-04-24 16:51 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-04-23 22:27 UTC (permalink / raw)
To: buildroot
On 04/22/15 20:09, Yann E. MORIN wrote:
> Currently, the matchbox entry in the menu is a non-package entry, that
> forcibly selects the matchbox-wm package, which is the real matchbox WM.
>
> So, get rid of the current matchbox option, rename the exisiting
> matchbox-wm to simply matchbox, so we have a real package from the
> onset.
>
> Since we're reusing the previous option for the WM package, there is no
> need for a entry in the legacy menu.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
[snip]
> +# After we called a package infra, w ecan include more files
^^
This comment becomes redundant after the move.
Regards,
Arnout
> include $(sort $(wildcard package/matchbox/*/*.mk))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts
2015-04-23 22:26 ` Arnout Vandecappelle
@ 2015-04-24 16:50 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-24 16:50 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-24 00:26 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
> > Use the package names instead of some fancy human-readable strings. ;-)
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> > package/matchbox/Config.in | 2 +-
> > package/matchbox/matchbox-common/Config.in | 4 ++--
> > package/matchbox/matchbox-desktop/Config.in | 2 +-
> > package/matchbox/matchbox-keyboard/Config.in | 2 +-
> > package/matchbox/matchbox-panel/Config.in | 2 +-
> > 5 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> > index 7d06bb2..e58aaf2 100644
> > --- a/package/matchbox/Config.in
> > +++ b/package/matchbox/Config.in
> > @@ -1,5 +1,5 @@
> > config BR2_PACKAGE_MATCHBOX
> > - bool "MatchBox Window Manager"
> > + bool "matchbox"
>
> Not so sure about this one... The upstream name is matchbox-window-manager, and
> it is useful information that it's a window manager. OTOH that's already in the
> comment right above it.
Well, even though I agree on principle:
- "matchbox-window-manager" is a bit long
- as you said, it's in the "Window Manager" section
- the global stuff is named "matchbox", and I suppose users would
expect to see just "matchbox"
> So in the end I'm OK either way.
I can see if naming that package accordingly to the upstream name, and
if it proves to cumbersome, I'll just let it as it is now...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox
2015-04-23 22:27 ` Arnout Vandecappelle
@ 2015-04-24 16:51 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-24 16:51 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-24 00:27 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
> > Currently, the matchbox entry in the menu is a non-package entry, that
> > forcibly selects the matchbox-wm package, which is the real matchbox WM.
> >
> > So, get rid of the current matchbox option, rename the exisiting
> > matchbox-wm to simply matchbox, so we have a real package from the
> > onset.
> >
> > Since we're reusing the previous option for the WM package, there is no
> > need for a entry in the legacy menu.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> > ---
> [snip]
> > +# After we called a package infra, w ecan include more files
> ^^
>
> This comment becomes redundant after the move.
Yup, I already removed that locally. Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop a real package
2015-04-23 21:49 ` Arnout Vandecappelle
@ 2015-04-24 17:37 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-24 17:37 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-23 23:49 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
> > Currently, matchbox-desktop is treated as if it were an option of the
> > matchbox package.
> >
> > But that's not true, since it is a real package all by itself, with its
> > own archive and its own buildsystem.
> >
> > So, make it a real package.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> One remark below...
>
> > ---
> > package/matchbox/Config.in | 7 +------
> > package/matchbox/matchbox-desktop/Config.in | 5 +++++
> > 2 files changed, 6 insertions(+), 6 deletions(-)
> > create mode 100644 package/matchbox/matchbox-desktop/Config.in
> >
> > diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> > index e791cea..39aff3c 100644
> > --- a/package/matchbox/Config.in
> > +++ b/package/matchbox/Config.in
> > @@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX
> > source "package/matchbox/matchbox-lib/Config.in"
> > source "package/matchbox/matchbox-wm/Config.in"
> > source "package/matchbox/matchbox-panel/Config.in"
> > -
> > -config BR2_PACKAGE_MATCHBOX_DESKTOP
> > - bool "Matchbox Desktop"
> > - select BR2_PACKAGE_ZLIB
> > - help
> > - A PDA style application launcher or 'item browser'.
> > +source "package/matchbox/matchbox-desktop/Config.in"
>
> Note that things should be sorted alphabetically. But I think that can better
> be combined with the one-directory-up patch.
Yup, done.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor a real package
2015-04-23 22:00 ` Arnout Vandecappelle
@ 2015-04-24 17:40 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-24 17:40 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-24 00:00 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
[--SNIP--]
> > diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
> > new file mode 100644
> > index 0000000..4dd088f
> > --- /dev/null
> > +++ b/package/matchbox/matchbox-startup-monitor/Config.in
> > @@ -0,0 +1,2 @@
> > +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
> > + bool
>
> This changes behaviour: it used to be selected automatically when
> startup-notification was selected. So you should add
>
> default y if BR2_PACKAGE_STARTUP_NOTIFICATION
>
> Of course, that's going to be reverted anyway when you later add a prompt to
> this package, so perhaps it's not that important.
Well, I've done as you suggested, so this patch does not introduce a
change in behaviour, and is purely a cleanup patch.
The change in beaviour is being done in a following patch.
Thanks!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes
2015-04-23 22:01 ` Arnout Vandecappelle
@ 2015-04-24 17:43 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-04-24 17:43 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-24 00:01 +0200, Arnout Vandecappelle spake thusly:
> On 04/22/15 20:09, Yann E. MORIN wrote:
> > Now that the matchbox package no longer forcibly add entries to the
> > PACKAGES list, and entirely relies on having proper packages, we can
> > safely include all matchbox sub-packages .mk files, and the pkg-infra
> > will take care of building only those that are enabled.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> This could already been done after patches 1 and 2.
It might be possible to do so, but I'd prefer all matchbox packages to
be converted/cleaned-up first, in case there's an unwanted side-effect
in the package infra about a package with no Kconfig entry.
So, I'm not moving that patch (also due to some lazyness in testing
there would be no problem! ;-] ).
Thanks!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies
2015-04-22 18:09 ` [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies Yann E. MORIN
@ 2015-05-01 20:01 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:01 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> matchbox-common can be used by both matchbox-desktop and matchbox-panel,
> so it needs to depend on either, not both.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/matchbox-common/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
> index f1c4ce3..6ec4697 100644
> --- a/package/matchbox/matchbox-common/Config.in
> +++ b/package/matchbox/matchbox-common/Config.in
> @@ -1,6 +1,6 @@
> config BR2_PACKAGE_MATCHBOX_COMMON
> bool "matchbox-common"
> - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
> + depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
> help
> Common desktop folders and matchbox-session script.
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display
2015-04-22 18:09 ` [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display Yann E. MORIN
@ 2015-05-01 20:02 ` Arnout Vandecappelle
2015-05-02 12:00 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:02 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Currently, matchbox-common depends on either matchbox-dsktop or
> matchbox-panel, and the three are organised so that matchbox-common gets
> indented in the menuconfig.
>
> That's a feature of menuconfig to consider the dependency chain to
> indent sub-options.
>
> Add a fake, prompt-less option to break that dependency chain.
>
> Note: yes, this is an dirty hack.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Now that you've moved the packages out of the matchbox/ directory and sorted
them alphabetically, this is no longer needed.
Or else, I missed the point :-)
Regards,
Arnout
> ---
> package/matchbox/matchbox-common/Config.in | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in
> index 6ec4697..93761f5 100644
> --- a/package/matchbox/matchbox-common/Config.in
> +++ b/package/matchbox/matchbox-common/Config.in
> @@ -1,3 +1,8 @@
> +# Hack! Break dependency chain so that matchbox-common does
> +# not get indented below matchbox-panel or matchbox-desktop.
> +config FOO
> + bool
> +
> config BR2_PACKAGE_MATCHBOX_COMMON
> bool "matchbox-common"
> depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency
2015-04-22 18:09 ` [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency Yann E. MORIN
@ 2015-05-01 20:07 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:07 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> matchbox-fakekey build-depends on xlib_libXtst, but does not select it.
>
> Fix that.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/matchbox/matchbox-fakekey/Config.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
> index 334f3a2..4708292 100644
> --- a/package/matchbox/matchbox-fakekey/Config.in
> +++ b/package/matchbox/matchbox-fakekey/Config.in
> @@ -1,2 +1,3 @@
> config BR2_PACKAGE_MATCHBOX_FAKEKEY
> bool
> + select BR2_PACKAGE_XLIB_LIBXTST
It also depends on matchbox-lib without selecting it (like all matchbox
packages BTW).
Of course, matchbox-lib is always selected because matchbox selects it and
matchbox-* depends on matchbox. However, if there is ever going to be a
checkpackage script, it will check for consistency between select and
DEPENDENCIES. So you can just as well add it now.
Probably best to do that for all matchbox packages in a single commit, so not
in this patch. Hence my Ack.
Regards,
Arnout
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency
2015-04-22 18:09 ` [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency Yann E. MORIN
@ 2015-05-01 20:19 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:19 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> matchbox-startup-monitor build-depends on startup-notifications, but
> does not select it.
>
> Fix that.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/matchbox-startup-monitor/Config.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
> index 4dd088f..92a1241 100644
> --- a/package/matchbox/matchbox-startup-monitor/Config.in
> +++ b/package/matchbox/matchbox-startup-monitor/Config.in
> @@ -1,2 +1,3 @@
> config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
> bool
> + select BR2_PACKAGE_STARTUP_NOTIFICATION
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages
2015-04-22 18:09 ` [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages Yann E. MORIN
@ 2015-05-01 20:23 ` Arnout Vandecappelle
2015-05-02 12:28 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:23 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> We currently do not have that many packages without a prompt, and when
> we do, they are limited to system-related packages that can't be
> selected or are forcibly selected under various system-specific
> conditions.
>
> This is clearly not the case for the matchbox sub-packages, so just give
> them a prompt, even when they are forcibly selected by the main matchbox
> package, and can't be selected without it.
>
> That will at least tell the user those packages exist and are to be
> built.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Actually, for startup-monitor, it couldn't be selected anymore after you
inverted the dependency chain (9b7e06a in your current branch). So perhaps that
part should move to the previous commit.
Regards,
Arnout
> ---
> package/matchbox/matchbox-fakekey/Config.in | 4 +++-
> package/matchbox/matchbox-lib/Config.in | 4 +++-
> package/matchbox/matchbox-startup-monitor/Config.in | 4 +++-
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
> index 4708292..889d039 100644
> --- a/package/matchbox/matchbox-fakekey/Config.in
> +++ b/package/matchbox/matchbox-fakekey/Config.in
> @@ -1,3 +1,5 @@
> config BR2_PACKAGE_MATCHBOX_FAKEKEY
> - bool
> + bool "matchbox-fakekey"
> select BR2_PACKAGE_XLIB_LIBXTST
> + help
> + Library for simulating key press events under X11.
> diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
> index 480e6fe..e50a543 100644
> --- a/package/matchbox/matchbox-lib/Config.in
> +++ b/package/matchbox/matchbox-lib/Config.in
> @@ -1,2 +1,4 @@
> config BR2_PACKAGE_MATCHBOX_LIB
> - bool
> + bool "matchbox-lib"
> + help
> + Matchbox common functionality library.
> diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
> index 92a1241..744e2b6 100644
> --- a/package/matchbox/matchbox-startup-monitor/Config.in
> +++ b/package/matchbox/matchbox-startup-monitor/Config.in
> @@ -1,3 +1,5 @@
> config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
> - bool
> + bool "matchbox-startup-monitor"
> select BR2_PACKAGE_STARTUP_NOTIFICATION
> + help
> + Matchbox Panel Startup Monitor Applet.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager
2015-04-22 18:09 ` [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager Yann E. MORIN
@ 2015-05-01 20:28 ` Arnout Vandecappelle
2015-05-02 13:10 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:28 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Although I wonder: are users really expected to go an select some X library to
enable the multisession feature? I think this is one that falls under the
"non-obvious dependency" class.
Regards,
Arnout
> ---
> package/matchbox/matchbox.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index 2d30ca0..5bd2587 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -35,6 +35,13 @@ else
> MATCHBOX_CONF_OPTS += --disable-startup-notification
> endif
>
> +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
> +MATCHBOX_CONF_OPTS += --enable-session
> +MATCHBOX_DEPENDENCIES += xlib_libSM
> +else
> +MATCHBOX_CONF_OPTS += --disable-session
> +endif
> +
> $(eval $(autotools-package))
>
> # After we called a package infra, w ecan include more files
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing
2015-04-22 18:09 ` [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing Yann E. MORIN
@ 2015-05-01 20:29 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:29 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Support for /compositing/ requires Xcomposite, Xfixes, Xdamage and
> Xrender, as can be seen in the configure.ac. And it is optional.
>
> Fix that by removing 'select' in Config.in, and chcking all four
checking
> dependencies in the .mk.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/Config.in | 1 -
> package/matchbox/matchbox.mk | 13 ++++++++-----
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index e58aaf2..39eb616 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -5,7 +5,6 @@ config BR2_PACKAGE_MATCHBOX
> select BR2_PACKAGE_FONTCONFIG
> select BR2_PACKAGE_EXPAT
> select BR2_PACKAGE_XLIB_LIBXEXT
> - select BR2_PACKAGE_XLIB_LIBXDAMAGE
> select BR2_PACKAGE_XLIB_LIBXCURSOR
> select BR2_PACKAGE_MATCHBOX_LIB
> help
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index 5bd2587..be94414 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -16,12 +16,15 @@ MATCHBOX_CONF_OPTS = --enable-expat
> # Workaround bug in configure script
> MATCHBOX_CONF_ENV = expat=yes
>
> -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
> -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
> +ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy)
> MATCHBOX_CONF_OPTS += --enable-composite
> -MATCHBOX_DEPENDENCIES += xlib_libXcomposite
> -MATCHBOX_DEPENDENCIES += xlib_libXpm
> -endif
> +MATCHBOX_DEPENDENCIES += \
> + xlib_libXcomposite \
> + xlib_libXfixes \
> + xlib_libXdamage \
> + xlib_libXrender
> +else
> +MATCHBOX_CONF_OPTS += --disable-composite
> endif
>
> ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing
2015-04-22 18:09 ` [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing Yann E. MORIN
@ 2015-05-01 20:31 ` Arnout Vandecappelle
2015-05-02 13:04 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:31 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Building with the experimental support for compositing is broken:
>
> /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
> -Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o
> toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o
> select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o
> list.o stack.o composite-engine.o session.o mbtheme.o xml.o
> -lmb -lX11
> -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> -lXext -lXcomposite -lXdamage -lXfixes -lXrender
> -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> -lX11 -lexpat
> -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> -lXfixes
> composite-engine.o: In function `gaussian':
> /home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
> undefined reference to `exp'
>
> That's because it forgets to link with -lm.
>
> However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as
> it still does not link with -lm at all.
>
> Furthermore, the package does not autoreconf, since it is missing the
> gconf m4 macros, and Buildroot does not have a package for gconf, hence
> we can not even patch Makefile.am and autoreconf.
>
> Patching Makefile.in (in addition to .am) could be a solution, but
> support for compositing is explicitly marked as being experimental.
>
> So, just forcibly disable it altogether.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
It kind of makes the previous patch redundant, but there you go...
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/matchbox/matchbox.mk | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index be94414..4ec3fb5 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
> MATCHBOX_LICENSE_FILES = COPYING
>
> MATCHBOX_DEPENDENCIES = matchbox-lib
> -MATCHBOX_CONF_OPTS = --enable-expat
> +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
>
> # Workaround bug in configure script
> MATCHBOX_CONF_ENV = expat=yes
>
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy)
> -MATCHBOX_CONF_OPTS += --enable-composite
> -MATCHBOX_DEPENDENCIES += \
> - xlib_libXcomposite \
> - xlib_libXfixes \
> - xlib_libXdamage \
> - xlib_libXrender
> -else
> -MATCHBOX_CONF_OPTS += --disable-composite
> -endif
> -
> ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
> MATCHBOX_DEPENDENCIES += xlib_libXft
> endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 21/30] package/matchbox: make it a menu
2015-04-22 18:09 ` [Buildroot] [PATCH 21/30] package/matchbox: make it a menu Yann E. MORIN
@ 2015-05-01 20:32 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:32 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> We're about to add a few more options, so it now warrants a menu for
> itself.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
I would move this earlier in the series (around the time you move everything
one directory up), but that's not so important.
Regards,
Arnout
> ---
> package/matchbox/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 39eb616..9d8d060 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -1,4 +1,4 @@
> -config BR2_PACKAGE_MATCHBOX
> +menuconfig BR2_PACKAGE_MATCHBOX
> bool "matchbox"
> depends on BR2_PACKAGE_XORG7
> depends on BR2_USE_MMU # fork()
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies
2015-04-22 18:09 ` [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies Yann E. MORIN
@ 2015-05-01 20:41 ` Arnout Vandecappelle
2015-05-01 20:58 ` Arnout Vandecappelle
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:41 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> xlib-libXft is only needed when building a 'standalone' matchbox, which
> means not using matchbox-lib.
>
> But we *are* building matchbox-lib, and we do not support the standalone
> mode (and probably won't, as even upstream says it is ugly, by lack of
> theming).
>
> Similarly, xlib-libXext is only used for its 'xsync' extension, for
> which support is entirely commented-out in matchbox.
>
> So, drop the dependency on xlib-libXft, and make it explicit we're not
> building either standalone modes; drop xlib-libXext.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/Config.in | 1 -
> package/matchbox/matchbox.mk | 6 +++++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 9d8d060..fa186e9 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_FONTCONFIG
> select BR2_PACKAGE_EXPAT
> - select BR2_PACKAGE_XLIB_LIBXEXT
> select BR2_PACKAGE_XLIB_LIBXCURSOR
> select BR2_PACKAGE_MATCHBOX_LIB
> help
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index 4ec3fb5..bce9520 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
> MATCHBOX_LICENSE_FILES = COPYING
>
> MATCHBOX_DEPENDENCIES = matchbox-lib
> -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
> +MATCHBOX_CONF_OPTS = \
> + --enable-expat \
> + --disable-composite \
> + --disable-standalone \
> + --disable-standalone-xft
So, is the dependency on xlib_libXft a few lines lower still relevant? If so,
comment on it in the commit message.
Regards,
Arnout
>
> # Workaround bug in configure script
> MATCHBOX_CONF_ENV = expat=yes
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected
2015-04-22 18:09 ` [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected Yann E. MORIN
@ 2015-05-01 20:44 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:44 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Though for an option that is not related to a dependency I think it's less
important to explicitly disable, it's still nice to do the same thing everywhere.
Regards,
Arnout
> ---
> package/matchbox/matchbox-common/matchbox-common.mk | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
> index da6bec7..038dd59 100644
> --- a/package/matchbox/matchbox-common/matchbox-common.mk
> +++ b/package/matchbox/matchbox-common/matchbox-common.mk
> @@ -14,6 +14,8 @@ MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
>
> ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
> MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders
> +else
> +MATCHBOX_COMMON_CONF_OPTS += --disable-pda-folders
> endif
>
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo
2015-04-22 18:09 ` [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo Yann E. MORIN
@ 2015-05-01 20:45 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:45 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> We usually explicitly enforce disabling optional support when it is
> possible.
>
> Do so for Cairo.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
> index 2017730..368a883 100644
> --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
> +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
> @@ -24,6 +24,7 @@ ifeq ($(BR2_PACKAGE_CAIRO),y)
> MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
> MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
> else
> +MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo
> MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
> endif
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies
2015-05-01 20:41 ` Arnout Vandecappelle
@ 2015-05-01 20:58 ` Arnout Vandecappelle
2015-05-02 13:40 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 20:58 UTC (permalink / raw)
To: buildroot
On 01/05/15 22:41, Arnout Vandecappelle wrote:
> On 22/04/15 20:09, Yann E. MORIN wrote:
>> xlib-libXft is only needed when building a 'standalone' matchbox, which
>> means not using matchbox-lib.
>>
>> But we *are* building matchbox-lib, and we do not support the standalone
>> mode (and probably won't, as even upstream says it is ugly, by lack of
>> theming).
>>
>> Similarly, xlib-libXext is only used for its 'xsync' extension, for
>> which support is entirely commented-out in matchbox.
>>
>> So, drop the dependency on xlib-libXft, and make it explicit we're not
>> building either standalone modes; drop xlib-libXext.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> ---
>> package/matchbox/Config.in | 1 -
>> package/matchbox/matchbox.mk | 6 +++++-
>> 2 files changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
>> index 9d8d060..fa186e9 100644
>> --- a/package/matchbox/Config.in
>> +++ b/package/matchbox/Config.in
>> @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
>> depends on BR2_USE_MMU # fork()
>> select BR2_PACKAGE_FONTCONFIG
>> select BR2_PACKAGE_EXPAT
>> - select BR2_PACKAGE_XLIB_LIBXEXT
>> select BR2_PACKAGE_XLIB_LIBXCURSOR
>> select BR2_PACKAGE_MATCHBOX_LIB
>> help
>> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
>> index 4ec3fb5..bce9520 100644
>> --- a/package/matchbox/matchbox.mk
>> +++ b/package/matchbox/matchbox.mk
>> @@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
>> MATCHBOX_LICENSE_FILES = COPYING
>>
>> MATCHBOX_DEPENDENCIES = matchbox-lib
>> -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
>> +MATCHBOX_CONF_OPTS = \
>> + --enable-expat \
>> + --disable-composite \
>> + --disable-standalone \
>> + --disable-standalone-xft
>
> So, is the dependency on xlib_libXft a few lines lower still relevant? If so,
> comment on it in the commit message.
It actually is, configure checks for it and it is used in the code. So
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
but I'd still like it to be mentioned in the commit message.
Regards,
Arnout
>
> Regards,
> Arnout
>
>>
>> # Workaround bug in configure script
>> MATCHBOX_CONF_ENV = expat=yes
>>
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency
2015-04-22 18:09 ` [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency Yann E. MORIN
@ 2015-05-01 21:02 ` Arnout Vandecappelle
2015-05-02 14:33 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 21:02 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> matchbox selects xlib-libXcursor, but does not build-depend on it.
>
> But xlib-libXcursor is only an optional dependency.
>
> Fix that by removing the select, and properly build-depend on it when
> it is enabled.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
While you're at it: configure also has --disable-gconf (we don't have the
package but maybe in the future...) and the script checks for xlib_libXfixes.
Regards,
Arnout
> ---
> package/matchbox/Config.in | 1 -
> package/matchbox/matchbox.mk | 4 ++++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index fa186e9..ad68718 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_FONTCONFIG
> select BR2_PACKAGE_EXPAT
> - select BR2_PACKAGE_XLIB_LIBXCURSOR
> select BR2_PACKAGE_MATCHBOX_LIB
> help
> Matchbox is an Open Source base environment for the X Window
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index bce9520..d2c3451 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -38,6 +38,10 @@ else
> MATCHBOX_CONF_OPTS += --disable-session
> endif
>
> +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
> +MATCHBOX_DEPENDENCIES += xlib_libXcursor
> +endif
> +
> $(eval $(autotools-package))
>
> # After we called a package infra, w ecan include more files
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet
2015-04-22 18:09 ` [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet Yann E. MORIN
@ 2015-05-01 21:39 ` Arnout Vandecappelle
2015-05-02 15:22 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 21:39 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> It is possible to use ACPI to monitor the battery with the battery
> min-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 id not built.
>
> What is a pity is that there is no way to explicitly enable or disable
> the applet; it only relies on auto-detection... :-(
>
> So, add an option to enable use of ACPI, visible only on architectures
> that have at least some hope of having ACPI support.
Since APM exists only on x86, there is basically no way to disable the applet
on x86. The only thing that the configure option does is to force the applet to
use the deprecated and most likely unavailable APM interface.
Therefore, I'd remove the Config.in option and just pass --enable-acpi-linux
unconditionally on x86 and aarch64. The worst that can happen is that you build
a tiny applet that turns out not to work.
That said, the applet doesn't build for me (with Sourcery x86_64 toolchain)
because the 'line_parse' inner function is declared static...
Regards,
Arnout
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++
> package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
> 2 files changed, 21 insertions(+)
>
> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> index 47bd10a..93241f0 100644
> --- a/package/matchbox/matchbox-panel/Config.in
> +++ b/package/matchbox/matchbox-panel/Config.in
> @@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL
> help
> A flexible always present 'window bar' for holding
> application launchers.
> +
> +if BR2_PACKAGE_MATCHBOX_PANEL
> +
> +config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
> + bool "use ACPI for battery mini-applet"
> + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
> + help
> + Use ACPI to monitor the battery.
> +
> + Say 'y' here to use ACPI to monitor the battery.
> + If you say 'n', then APM will be used if available;
> + otherwise the battery monitor mini-applet is not
> + built.
> +
> +endif # BR2_PACKAGE_MATCHBOX_PANEL
> diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> index f7d699b..aa9018c 100644
> --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> @@ -20,6 +20,12 @@ else
> MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
> endif
>
> +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y)
> +MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux
> +else
> +MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
> +endif
> +
> ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
> MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
> endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify
2015-04-22 18:09 ` [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify Yann E. MORIN
@ 2015-05-01 21:44 ` Arnout Vandecappelle
2015-05-02 15:23 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 21:44 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> Using dnotify, matchbox-panel can automatically reload its menu.
>
> dnotify requires a kernel >=2.4, which we can consider to be
> virtually for granted.
So, why not enable this unconditionally?
Regards,
Arnout
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/matchbox/matchbox-panel/Config.in | 7 +++++++
> package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> index 93241f0..6daf2db 100644
> --- a/package/matchbox/matchbox-panel/Config.in
> +++ b/package/matchbox/matchbox-panel/Config.in
> @@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
> otherwise the battery monitor mini-applet is not
> built.
>
> +config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY
> + bool "use dnotify"
> + help
> + Using dnotify allows matchbox-panel to automatically reload
> + its menu when entries are changed (e.g. when a new application
> + is installed).
> +
> endif # BR2_PACKAGE_MATCHBOX_PANEL
> diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> index aa9018c..dedbab6 100644
> --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> @@ -26,6 +26,12 @@ else
> MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
> endif
>
> +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y)
> +MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify
> +else
> +MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify
> +endif
> +
> ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
> MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
> endif
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring
2015-04-22 18:09 ` [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring Yann E. MORIN
@ 2015-05-01 21:45 ` Arnout Vandecappelle
0 siblings, 0 replies; 82+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 21:45 UTC (permalink / raw)
To: buildroot
On 22/04/15 20:09, Yann E. MORIN wrote:
> matchbox-panel can build a simple applet to monitor the WiFi. For that,
> it tries to see if libiwl is available; if so, WiFi monitoring is
> enabled, otherwise it is disabled; there is not option to explicitly
> enable or disable it.
>
> Currently, matchbox-panel depends on the wireless-tools package.
> However, that's not enough, since the library will only be installed if
> explictly enabled in the menuconfig *and* this is not a static build.
explicitly
>
> Change the dependency to be on the library, not the package.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/matchbox/matchbox-panel/matchbox-panel.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> index dedbab6..455ae34 100644
> --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> @@ -32,7 +32,7 @@ else
> MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify
> endif
>
> -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
> +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y)
> MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
> endif
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display
2015-05-01 20:02 ` Arnout Vandecappelle
@ 2015-05-02 12:00 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 12:00 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 22:02 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > Currently, matchbox-common depends on either matchbox-dsktop or
> > matchbox-panel, and the three are organised so that matchbox-common gets
> > indented in the menuconfig.
> >
> > That's a feature of menuconfig to consider the dependency chain to
> > indent sub-options.
> >
> > Add a fake, prompt-less option to break that dependency chain.
> >
> > Note: yes, this is an dirty hack.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Now that you've moved the packages out of the matchbox/ directory and sorted
> them alphabetically, this is no longer needed.
>
> Or else, I missed the point :-)
No, that's correct. I'll drop this.
Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages
2015-05-01 20:23 ` Arnout Vandecappelle
@ 2015-05-02 12:28 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 12:28 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 22:23 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > We currently do not have that many packages without a prompt, and when
> > we do, they are limited to system-related packages that can't be
> > selected or are forcibly selected under various system-specific
> > conditions.
> >
> > This is clearly not the case for the matchbox sub-packages, so just give
> > them a prompt, even when they are forcibly selected by the main matchbox
> > package, and can't be selected without it.
> >
> > That will at least tell the user those packages exist and are to be
> > built.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Actually, for startup-monitor, it couldn't be selected anymore after you
> inverted the dependency chain (9b7e06a in your current branch). So perhaps that
> part should move to the previous commit.
Indeed, I missed that case. I'll fix it.
Thanks! :-)
Regards,
Yann E. MORIN.
> Regards,
> Arnout
>
> > ---
> > package/matchbox/matchbox-fakekey/Config.in | 4 +++-
> > package/matchbox/matchbox-lib/Config.in | 4 +++-
> > package/matchbox/matchbox-startup-monitor/Config.in | 4 +++-
> > 3 files changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in
> > index 4708292..889d039 100644
> > --- a/package/matchbox/matchbox-fakekey/Config.in
> > +++ b/package/matchbox/matchbox-fakekey/Config.in
> > @@ -1,3 +1,5 @@
> > config BR2_PACKAGE_MATCHBOX_FAKEKEY
> > - bool
> > + bool "matchbox-fakekey"
> > select BR2_PACKAGE_XLIB_LIBXTST
> > + help
> > + Library for simulating key press events under X11.
> > diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
> > index 480e6fe..e50a543 100644
> > --- a/package/matchbox/matchbox-lib/Config.in
> > +++ b/package/matchbox/matchbox-lib/Config.in
> > @@ -1,2 +1,4 @@
> > config BR2_PACKAGE_MATCHBOX_LIB
> > - bool
> > + bool "matchbox-lib"
> > + help
> > + Matchbox common functionality library.
> > diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in
> > index 92a1241..744e2b6 100644
> > --- a/package/matchbox/matchbox-startup-monitor/Config.in
> > +++ b/package/matchbox/matchbox-startup-monitor/Config.in
> > @@ -1,3 +1,5 @@
> > config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR
> > - bool
> > + bool "matchbox-startup-monitor"
> > select BR2_PACKAGE_STARTUP_NOTIFICATION
> > + help
> > + Matchbox Panel Startup Monitor Applet.
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing
2015-05-01 20:31 ` Arnout Vandecappelle
@ 2015-05-02 13:04 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 13:04 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 22:31 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > Building with the experimental support for compositing is broken:
> >
> > /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc
> > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
> > -Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o
> > toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o
> > select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o
> > list.o stack.o composite-engine.o session.o mbtheme.o xml.o
> > -lmb -lX11
> > -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> > -lXext -lXcomposite -lXdamage -lXfixes -lXrender
> > -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> > -lX11 -lexpat
> > -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib
> > -lXfixes
> > composite-engine.o: In function `gaussian':
> > /home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
> > undefined reference to `exp'
> >
> > That's because it forgets to link with -lm.
> >
> > However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as
> > it still does not link with -lm at all.
> >
> > Furthermore, the package does not autoreconf, since it is missing the
> > gconf m4 macros, and Buildroot does not have a package for gconf, hence
> > we can not even patch Makefile.am and autoreconf.
> >
> > Patching Makefile.in (in addition to .am) could be a solution, but
> > support for compositing is explicitly marked as being experimental.
> >
> > So, just forcibly disable it altogether.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> It kind of makes the previous patch redundant, but there you go...
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Right. I've squashed the two patches together, so compositing is
directly disabled without trying to fix it up first.
Thanks! :-)
Regards,
Yann E. MORIN.
> > ---
> > package/matchbox/matchbox.mk | 13 +------------
> > 1 file changed, 1 insertion(+), 12 deletions(-)
> >
> > diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> > index be94414..4ec3fb5 100644
> > --- a/package/matchbox/matchbox.mk
> > +++ b/package/matchbox/matchbox.mk
> > @@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
> > MATCHBOX_LICENSE_FILES = COPYING
> >
> > MATCHBOX_DEPENDENCIES = matchbox-lib
> > -MATCHBOX_CONF_OPTS = --enable-expat
> > +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
> >
> > # Workaround bug in configure script
> > MATCHBOX_CONF_ENV = expat=yes
> >
> > -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy)
> > -MATCHBOX_CONF_OPTS += --enable-composite
> > -MATCHBOX_DEPENDENCIES += \
> > - xlib_libXcomposite \
> > - xlib_libXfixes \
> > - xlib_libXdamage \
> > - xlib_libXrender
> > -else
> > -MATCHBOX_CONF_OPTS += --disable-composite
> > -endif
> > -
> > ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
> > MATCHBOX_DEPENDENCIES += xlib_libXft
> > endif
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager
2015-05-01 20:28 ` Arnout Vandecappelle
@ 2015-05-02 13:10 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 13:10 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 22:28 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Although I wonder: are users really expected to go an select some X library to
> enable the multisession feature? I think this is one that falls under the
> "non-obvious dependency" class.
OK, I'll make that an option in Kconfig.
Regards,
Yann E. MORIN.
> Regards,
> Arnout
>
> > ---
> > package/matchbox/matchbox.mk | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> > index 2d30ca0..5bd2587 100644
> > --- a/package/matchbox/matchbox.mk
> > +++ b/package/matchbox/matchbox.mk
> > @@ -35,6 +35,13 @@ else
> > MATCHBOX_CONF_OPTS += --disable-startup-notification
> > endif
> >
> > +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
> > +MATCHBOX_CONF_OPTS += --enable-session
> > +MATCHBOX_DEPENDENCIES += xlib_libSM
> > +else
> > +MATCHBOX_CONF_OPTS += --disable-session
> > +endif
> > +
> > $(eval $(autotools-package))
> >
> > # After we called a package infra, w ecan include more files
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies
2015-05-01 20:58 ` Arnout Vandecappelle
@ 2015-05-02 13:40 ` Yann E. MORIN
2015-05-02 14:12 ` Yann E. MORIN
0 siblings, 1 reply; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 13:40 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 22:58 +0200, Arnout Vandecappelle spake thusly:
> On 01/05/15 22:41, Arnout Vandecappelle wrote:
> > On 22/04/15 20:09, Yann E. MORIN wrote:
> >> xlib-libXft is only needed when building a 'standalone' matchbox, which
> >> means not using matchbox-lib.
> >>
> >> But we *are* building matchbox-lib, and we do not support the standalone
> >> mode (and probably won't, as even upstream says it is ugly, by lack of
> >> theming).
> >>
> >> Similarly, xlib-libXext is only used for its 'xsync' extension, for
> >> which support is entirely commented-out in matchbox.
> >>
> >> So, drop the dependency on xlib-libXft, and make it explicit we're not
> >> building either standalone modes; drop xlib-libXext.
> >>
> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >> ---
> >> package/matchbox/Config.in | 1 -
> >> package/matchbox/matchbox.mk | 6 +++++-
> >> 2 files changed, 5 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> >> index 9d8d060..fa186e9 100644
> >> --- a/package/matchbox/Config.in
> >> +++ b/package/matchbox/Config.in
> >> @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
> >> depends on BR2_USE_MMU # fork()
> >> select BR2_PACKAGE_FONTCONFIG
> >> select BR2_PACKAGE_EXPAT
> >> - select BR2_PACKAGE_XLIB_LIBXEXT
> >> select BR2_PACKAGE_XLIB_LIBXCURSOR
> >> select BR2_PACKAGE_MATCHBOX_LIB
> >> help
> >> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> >> index 4ec3fb5..bce9520 100644
> >> --- a/package/matchbox/matchbox.mk
> >> +++ b/package/matchbox/matchbox.mk
> >> @@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+
> >> MATCHBOX_LICENSE_FILES = COPYING
> >>
> >> MATCHBOX_DEPENDENCIES = matchbox-lib
> >> -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite
> >> +MATCHBOX_CONF_OPTS = \
> >> + --enable-expat \
> >> + --disable-composite \
> >> + --disable-standalone \
> >> + --disable-standalone-xft
> >
> > So, is the dependency on xlib_libXft a few lines lower still relevant? If so,
> > comment on it in the commit message.
>
> It actually is, configure checks for it and it is used in the code. So
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> but I'd still like it to be mentioned in the commit message.
Well, not sure. AFAICS, checks for libxft are done only when either
standalone or standalone-xft is specified. Also, Xft is only used in
src/mbtheme-standalone.c, which as its name implies, is the standalone
mode.
So, I'll remove that dependency in the patch that disable standalone
mode (pending a test-build without libXft, but pretty confident it'll
work, nothing selects it in matchbox, I never manually selected it, and
all my previous builds were successfull).
Thanks!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies
2015-05-02 13:40 ` Yann E. MORIN
@ 2015-05-02 14:12 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 14:12 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-02 15:40 +0200, Yann E. MORIN spake thusly:
> On 2015-05-01 22:58 +0200, Arnout Vandecappelle spake thusly:
> > On 01/05/15 22:41, Arnout Vandecappelle wrote:
> > > On 22/04/15 20:09, Yann E. MORIN wrote:
> > >> xlib-libXft is only needed when building a 'standalone' matchbox, which
> > >> means not using matchbox-lib.
[--SNIP--]
> > > So, is the dependency on xlib_libXft a few lines lower still relevant? If so,
> > > comment on it in the commit message.
> >
> > It actually is, configure checks for it and it is used in the code. So
> > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> > but I'd still like it to be mentioned in the commit message.
>
> Well, not sure. AFAICS, checks for libxft are done only when either
> standalone or standalone-xft is specified. Also, Xft is only used in
> src/mbtheme-standalone.c, which as its name implies, is the standalone
> mode.
>
> So, I'll remove that dependency in the patch that disable standalone
> mode (pending a test-build without libXft, but pretty confident it'll
> work, nothing selects it in matchbox, I never manually selected it, and
> all my previous builds were successfull).
OK, the build goes on successfully as expected.
So I'll drop the dependency on libXft.
Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency
2015-05-01 21:02 ` Arnout Vandecappelle
@ 2015-05-02 14:33 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 14:33 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 23:02 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > matchbox selects xlib-libXcursor, but does not build-depend on it.
> >
> > But xlib-libXcursor is only an optional dependency.
> >
> > Fix that by removing the select, and properly build-depend on it when
> > it is enabled.
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> While you're at it: configure also has --disable-gconf (we don't have the
> package but maybe in the future...) and the script checks for xlib_libXfixes.
Both fixed. Thanks! :-)
Regards,
Yann E. MORIN.
> > ---
> > package/matchbox/Config.in | 1 -
> > package/matchbox/matchbox.mk | 4 ++++
> > 2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> > index fa186e9..ad68718 100644
> > --- a/package/matchbox/Config.in
> > +++ b/package/matchbox/Config.in
> > @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX
> > depends on BR2_USE_MMU # fork()
> > select BR2_PACKAGE_FONTCONFIG
> > select BR2_PACKAGE_EXPAT
> > - select BR2_PACKAGE_XLIB_LIBXCURSOR
> > select BR2_PACKAGE_MATCHBOX_LIB
> > help
> > Matchbox is an Open Source base environment for the X Window
> > diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> > index bce9520..d2c3451 100644
> > --- a/package/matchbox/matchbox.mk
> > +++ b/package/matchbox/matchbox.mk
> > @@ -38,6 +38,10 @@ else
> > MATCHBOX_CONF_OPTS += --disable-session
> > endif
> >
> > +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
> > +MATCHBOX_DEPENDENCIES += xlib_libXcursor
> > +endif
> > +
> > $(eval $(autotools-package))
> >
> > # After we called a package infra, w ecan include more files
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet
2015-05-01 21:39 ` Arnout Vandecappelle
@ 2015-05-02 15:22 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 15:22 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 23:39 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > It is possible to use ACPI to monitor the battery with the battery
> > min-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 id not built.
> >
> > What is a pity is that there is no way to explicitly enable or disable
> > the applet; it only relies on auto-detection... :-(
> >
> > So, add an option to enable use of ACPI, visible only on architectures
> > that have at least some hope of having ACPI support.
>
> Since APM exists only on x86, there is basically no way to disable the applet
> on x86. The only thing that the configure option does is to force the applet to
> use the deprecated and most likely unavailable APM interface.
>
> Therefore, I'd remove the Config.in option and just pass --enable-acpi-linux
> unconditionally on x86 and aarch64. The worst that can happen is that you build
> a tiny applet that turns out not to work.
Ok, done: ACPI forcibly used on supported platforms.
> That said, the applet doesn't build for me (with Sourcery x86_64 toolchain)
> because the 'line_parse' inner function is declared static...
Weird, itworked for me, but with another toolchain. Fixed.
Regards,
Yann E. MORIN.
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> > package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++
> > package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
> > 2 files changed, 21 insertions(+)
> >
> > diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> > index 47bd10a..93241f0 100644
> > --- a/package/matchbox/matchbox-panel/Config.in
> > +++ b/package/matchbox/matchbox-panel/Config.in
> > @@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL
> > help
> > A flexible always present 'window bar' for holding
> > application launchers.
> > +
> > +if BR2_PACKAGE_MATCHBOX_PANEL
> > +
> > +config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
> > + bool "use ACPI for battery mini-applet"
> > + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
> > + help
> > + Use ACPI to monitor the battery.
> > +
> > + Say 'y' here to use ACPI to monitor the battery.
> > + If you say 'n', then APM will be used if available;
> > + otherwise the battery monitor mini-applet is not
> > + built.
> > +
> > +endif # BR2_PACKAGE_MATCHBOX_PANEL
> > diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> > index f7d699b..aa9018c 100644
> > --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> > +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> > @@ -20,6 +20,12 @@ else
> > MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
> > endif
> >
> > +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y)
> > +MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux
> > +else
> > +MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
> > +endif
> > +
> > ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
> > MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
> > endif
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
* [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify
2015-05-01 21:44 ` Arnout Vandecappelle
@ 2015-05-02 15:23 ` Yann E. MORIN
0 siblings, 0 replies; 82+ messages in thread
From: Yann E. MORIN @ 2015-05-02 15:23 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 23:44 +0200, Arnout Vandecappelle spake thusly:
> On 22/04/15 20:09, Yann E. MORIN wrote:
> > Using dnotify, matchbox-panel can automatically reload its menu.
> >
> > dnotify requires a kernel >=2.4, which we can consider to be
> > virtually for granted.
>
> So, why not enable this unconditionally?
Well... OK, done.
Regards,
Yann E. MORIN.
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> > package/matchbox/matchbox-panel/Config.in | 7 +++++++
> > package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++
> > 2 files changed, 13 insertions(+)
> >
> > diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in
> > index 93241f0..6daf2db 100644
> > --- a/package/matchbox/matchbox-panel/Config.in
> > +++ b/package/matchbox/matchbox-panel/Config.in
> > @@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI
> > otherwise the battery monitor mini-applet is not
> > built.
> >
> > +config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY
> > + bool "use dnotify"
> > + help
> > + Using dnotify allows matchbox-panel to automatically reload
> > + its menu when entries are changed (e.g. when a new application
> > + is installed).
> > +
> > endif # BR2_PACKAGE_MATCHBOX_PANEL
> > diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
> > index aa9018c..dedbab6 100644
> > --- a/package/matchbox/matchbox-panel/matchbox-panel.mk
> > +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
> > @@ -26,6 +26,12 @@ else
> > MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux
> > endif
> >
> > +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y)
> > +MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify
> > +else
> > +MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify
> > +endif
> > +
> > ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
> > MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
> > endif
> >
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 82+ messages in thread
end of thread, other threads:[~2015-05-02 15:23 UTC | newest]
Thread overview: 82+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-22 18:09 [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 01/30] package/matchbox: make matchbox-lib a real package Yann E. MORIN
2015-04-23 21:29 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 02/30] package/matchbox: make matchbox-wm " Yann E. MORIN
2015-04-23 21:35 ` Arnout Vandecappelle
2015-04-23 21:44 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 03/30] package/matchbox-wm: drop useless commented options Yann E. MORIN
2015-04-23 21:33 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 04/30] package/matchbox: make matchbox-panel a real package Yann E. MORIN
2015-04-23 21:36 ` Arnout Vandecappelle
2015-04-23 21:46 ` Arnout Vandecappelle
2015-04-23 21:47 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 05/30] package/matchbox: make matchbox-desktop " Yann E. MORIN
2015-04-23 21:49 ` Arnout Vandecappelle
2015-04-24 17:37 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 06/30] package/matchbox: make matchbox-common " Yann E. MORIN
2015-04-23 21:52 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 07/30] package/matchbox: make matchbox-fakekey " Yann E. MORIN
2015-04-23 21:54 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 08/30] package/matchbox: make matchbox-keyboard " Yann E. MORIN
2015-04-23 21:55 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 09/30] package/matchbox: make match-startup-monitor " Yann E. MORIN
2015-04-23 22:00 ` Arnout Vandecappelle
2015-04-24 17:40 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 10/30] package/matchbox: remove superfluous conditional includes Yann E. MORIN
2015-04-23 22:01 ` Arnout Vandecappelle
2015-04-24 17:43 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 11/30] package/matchbox: point to new home Yann E. MORIN
2015-04-23 8:58 ` Alexandre Belloni
2015-04-23 16:38 ` Yann E. MORIN
2015-04-23 22:01 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 12/30] package/matchbox: get rid of intermediate non-package matchbox Yann E. MORIN
2015-04-23 22:27 ` Arnout Vandecappelle
2015-04-24 16:51 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 13/30] package/matchbox: fix option prompts Yann E. MORIN
2015-04-23 22:26 ` Arnout Vandecappelle
2015-04-24 16:50 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 14/30] package/matchbox-common: fix dependencies Yann E. MORIN
2015-05-01 20:01 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 15/30] package/matchbox-common: break dependency chain for display Yann E. MORIN
2015-05-01 20:02 ` Arnout Vandecappelle
2015-05-02 12:00 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 16/30] package/matchbox-fakekey: add missing dependency Yann E. MORIN
2015-05-01 20:07 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 17/30] package/matchbox-startup-monitor: add misisng dependency Yann E. MORIN
2015-05-01 20:19 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 18/30] package/matchbox: finally add prompts to all sub-packages Yann E. MORIN
2015-05-01 20:23 ` Arnout Vandecappelle
2015-05-02 12:28 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 19/30] package/matchbox: enable support for the Xsession manager Yann E. MORIN
2015-05-01 20:28 ` Arnout Vandecappelle
2015-05-02 13:10 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 20/30] package/matchbox: cleanup handling of support for compositing Yann E. MORIN
2015-05-01 20:29 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 21/30] package/matchbox: make it a menu Yann E. MORIN
2015-05-01 20:32 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 22/30] package/matchbox: forcibly disable support for compositing Yann E. MORIN
2015-05-01 20:31 ` Arnout Vandecappelle
2015-05-02 13:04 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 23/30] package/matchbox: drop useless dependencies Yann E. MORIN
2015-05-01 20:41 ` Arnout Vandecappelle
2015-05-01 20:58 ` Arnout Vandecappelle
2015-05-02 13:40 ` Yann E. MORIN
2015-05-02 14:12 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 24/30] package/matchbox-keyboard: enforce disabling support for cairo Yann E. MORIN
2015-05-01 20:45 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 25/30] package/matchbox-common: explicitly disable PDA folders when not selected Yann E. MORIN
2015-05-01 20:44 ` Arnout Vandecappelle
2015-04-22 18:09 ` [Buildroot] [PATCH 26/30] package/matchbox: wrap long lines Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 27/30] package/matchbox: xlib-libXcursor is an optional dependency Yann E. MORIN
2015-05-01 21:02 ` Arnout Vandecappelle
2015-05-02 14:33 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 28/30] package/matchbox-panel: add option to use ACPI for the battery applet Yann E. MORIN
2015-05-01 21:39 ` Arnout Vandecappelle
2015-05-02 15:22 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 29/30] package/matchbox-panel: add support for dnotify Yann E. MORIN
2015-05-01 21:44 ` Arnout Vandecappelle
2015-05-02 15:23 ` Yann E. MORIN
2015-04-22 18:09 ` [Buildroot] [PATCH 30/30] package/matchbox-panel: fix WiFi monitoring Yann E. MORIN
2015-05-01 21:45 ` Arnout Vandecappelle
2015-04-23 21:24 ` [Buildroot] [PATCH 0/30] matchbox: huge cleanups (branch yem/matchbox) Arnout Vandecappelle
2015-04-23 21:27 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.