* [Buildroot] [PATCH/next 01/13] package/sway/Config.in: select BR2_PACKAGE_XKEYBOARD_CONFIG
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package Adam Duskett
` (11 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Much like weston, this is a runtime dependency.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index f8d073520f..7c1e849bbc 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -20,6 +20,7 @@ config BR2_PACKAGE_SWAY
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PNG
select BR2_PACKAGE_PANGO
+ select BR2_PACKAGE_XKEYBOARD_CONFIG # Runtime dependency
help
i3-compatible Wayland compositor
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 01/13] package/sway/Config.in: select BR2_PACKAGE_XKEYBOARD_CONFIG Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 13:44 ` Thomas Petazzoni via buildroot
2023-11-23 0:08 ` [Buildroot] [PATCH/next 03/13] package/tllist: " Adam Duskett
` (10 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
This package is an alternative to dmenu for X. Sway uses it by default as its
menu bar.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/dmenu-wayland/Config.in | 26 ++++++++++++++++++++++
package/dmenu-wayland/dmenu-wayland.hash | 3 +++
package/dmenu-wayland/dmenu-wayland.mk | 28 ++++++++++++++++++++++++
5 files changed, 59 insertions(+)
create mode 100644 package/dmenu-wayland/Config.in
create mode 100644 package/dmenu-wayland/dmenu-wayland.hash
create mode 100644 package/dmenu-wayland/dmenu-wayland.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 1f26e9bc81..16be3896f8 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -33,6 +33,7 @@ F: package/vulkan-tools/
N: Adam Duskett <adam.duskett@amarulasolutions.com>
F: package/depot-tools/
+F: package/dmenu-wayland/
F: package/flutter-engine/
F: package/flutter-gallery/
F: package/flutter-pi/
diff --git a/package/Config.in b/package/Config.in
index 5a3410d758..790ed3cbd3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -313,6 +313,7 @@ menu "Graphic libraries and applications (graphic/text)"
comment "Graphic applications"
source "package/cage/Config.in"
source "package/cog/Config.in"
+ source "package/dmenu-wayland/Config.in"
source "package/fswebcam/Config.in"
source "package/ghostscript/Config.in"
source "package/glmark2/Config.in"
diff --git a/package/dmenu-wayland/Config.in b/package/dmenu-wayland/Config.in
new file mode 100644
index 0000000000..111bbfb434
--- /dev/null
+++ b/package/dmenu-wayland/Config.in
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_DMENU_WAYLAND
+ bool "dmenu-wayland"
+ depends on BR2_USE_MMU # pango -> lib2
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2, wayland
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuz
+ depends on !BR2_STATIC_LIBS # wayland -> dlfcn.h
+ depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype support
+ depends on BR2_USE_WCHAR # pango -> glib2
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_CAIRO_PNG
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBXKBCOMMON
+ select BR2_PACKAGE_PANGO
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_WAYLAND_PROTOCOLS
+ help
+ dmenu-wl is an efficient dynamic menu for wayland (wlroots).
+
+ https://github.com/nyyManni/dmenu-wayland
+
+comment "dmenu-wayland needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9"
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \
+ !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/package/dmenu-wayland/dmenu-wayland.hash b/package/dmenu-wayland/dmenu-wayland.hash
new file mode 100644
index 0000000000..007779624b
--- /dev/null
+++ b/package/dmenu-wayland/dmenu-wayland.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 727f3525a7336491620dbe184e3c0d1deee15c85503a5d8c849fb0e5091e7dee dmenu-wayland-a380201dff5bfac2dace553d7eaedb6cea6855f9-br1.tar.gz
+sha256 95224d118a325daf31828afcca98cd958d53f0a7cdd856b50b1be8ac44832faf LICENSE
diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk
new file mode 100644
index 0000000000..5a6c0194d5
--- /dev/null
+++ b/package/dmenu-wayland/dmenu-wayland.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# dmenu-wayland
+#
+################################################################################
+
+DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9
+DMENU_WAYLAND_SITE = https://github.com/nyyManni/dmenu-wayland.git
+DMENU_WAYLAND_SITE_METHOD = git
+DMENU_WAYLAND_LICENSE = MIT
+DMENU_WAYLAND_LICENSE_FILES = LICENSE
+
+DMENU_WAYLAND_DEPENDENCIES = \
+ cairo \
+ libglib2 \
+ libxkbcommon \
+ pango \
+ wayland \
+ wayland-protocols
+
+# By default, sway calls dmenu not dmenu-wl
+define DMENU_WAYLAND_SYMLINK_DMENU_WL
+ cd $(TARGET_DIR)/usr/bin && \
+ ln -sf dmenu-wl dmenu
+endef
+DMENU_WAYLAND_POST_INSTALL_TARGET_HOOKS += DMENU_WAYLAND_SYMLINK_DMENU_WL
+
+$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 0:08 ` [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package Adam Duskett
@ 2023-11-23 13:44 ` Thomas Petazzoni via buildroot
2023-11-23 19:12 ` Adam Duskett
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-23 13:44 UTC (permalink / raw)
To: Adam Duskett; +Cc: Eric Le Bihan, Raphael Pavlidis, buildroot
Hello Adam,
On Wed, 22 Nov 2023 17:08:08 -0700
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> diff --git a/package/dmenu-wayland/Config.in b/package/dmenu-wayland/Config.in
> new file mode 100644
> index 0000000000..111bbfb434
> --- /dev/null
> +++ b/package/dmenu-wayland/Config.in
> @@ -0,0 +1,26 @@
> +config BR2_PACKAGE_DMENU_WAYLAND
> + bool "dmenu-wayland"
> + depends on BR2_USE_MMU # pango -> lib2
lib2 ?
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
> + depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2, wayland
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuz
> + depends on !BR2_STATIC_LIBS # wayland -> dlfcn.h
> + depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype support
> + depends on BR2_USE_WCHAR # pango -> glib2
I think listing the first order dependency is enough.
> +DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9
> +DMENU_WAYLAND_SITE = https://github.com/nyyManni/dmenu-wayland.git
> +DMENU_WAYLAND_SITE_METHOD = git
Use the github macro?
> +DMENU_WAYLAND_LICENSE = MIT
> +DMENU_WAYLAND_LICENSE_FILES = LICENSE
> +
> +DMENU_WAYLAND_DEPENDENCIES = \
> + cairo \
> + libglib2 \
> + libxkbcommon \
> + pango \
> + wayland \
> + wayland-protocols
> +
> +# By default, sway calls dmenu not dmenu-wl
> +define DMENU_WAYLAND_SYMLINK_DMENU_WL
> + cd $(TARGET_DIR)/usr/bin && \
> + ln -sf dmenu-wl dmenu
I think:
ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu
achieves the same.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 13:44 ` Thomas Petazzoni via buildroot
@ 2023-11-23 19:12 ` Adam Duskett
2023-11-23 19:13 ` Adam Duskett
2023-11-24 8:41 ` Thomas Petazzoni via buildroot
0 siblings, 2 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 19:12 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Eric Le Bihan, Raphael Pavlidis, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 2454 bytes --]
Hey Thomas;
lib2 -> glib2
"I think listing the first order dependency is enough." Not sure what you
mean.
Using the github macro wouldn't work as the release is quite old and lacks
an absurd amount
of features and fixes.
Adam Duskett
Senior Embedded Systems Developer
adam.duskett@amarulasolutions.com
__________________________________
Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9170
info@amarulasolutions.com
www.amarulasolutions.com
On Thu, Nov 23, 2023 at 6:44 AM Thomas Petazzoni <
thomas.petazzoni@bootlin.com> wrote:
> Hello Adam,
>
> On Wed, 22 Nov 2023 17:08:08 -0700
> Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
>
> > diff --git a/package/dmenu-wayland/Config.in
> b/package/dmenu-wayland/Config.in
> > new file mode 100644
> > index 0000000000..111bbfb434
> > --- /dev/null
> > +++ b/package/dmenu-wayland/Config.in
> > @@ -0,0 +1,26 @@
> > +config BR2_PACKAGE_DMENU_WAYLAND
> > + bool "dmenu-wayland"
> > + depends on BR2_USE_MMU # pango -> lib2
>
> lib2 ?
>
> > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
> > + depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2, wayland
> > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuz
> > + depends on !BR2_STATIC_LIBS # wayland -> dlfcn.h
> > + depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype support
> > + depends on BR2_USE_WCHAR # pango -> glib2
>
> I think listing the first order dependency is enough.
>
> > +DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9
> > +DMENU_WAYLAND_SITE = https://github.com/nyyManni/dmenu-wayland.git
> > +DMENU_WAYLAND_SITE_METHOD = git
>
> Use the github macro?
>
> > +DMENU_WAYLAND_LICENSE = MIT
> > +DMENU_WAYLAND_LICENSE_FILES = LICENSE
> > +
> > +DMENU_WAYLAND_DEPENDENCIES = \
> > + cairo \
> > + libglib2 \
> > + libxkbcommon \
> > + pango \
> > + wayland \
> > + wayland-protocols
> > +
> > +# By default, sway calls dmenu not dmenu-wl
> > +define DMENU_WAYLAND_SYMLINK_DMENU_WL
> > + cd $(TARGET_DIR)/usr/bin && \
> > + ln -sf dmenu-wl dmenu
>
> I think:
>
> ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu
>
> achieves the same.
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
>
[-- Attachment #1.2: Type: text/html, Size: 6298 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 19:12 ` Adam Duskett
@ 2023-11-23 19:13 ` Adam Duskett
2023-11-24 8:43 ` Thomas Petazzoni via buildroot
2023-11-24 8:41 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 19:13 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Eric Le Bihan, Raphael Pavlidis, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 3140 bytes --]
Forgot to mention, does it really matter if I use
ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu vs what is there now? Does it
not achieve the same goal?
Thanks!
Adam Duskett
Senior Embedded Systems Developer
M. +1208-515-8102
adam.duskett@amarulasolutions.com
__________________________________
Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9170
info@amarulasolutions.com
www.amarulasolutions.com
On Thu, Nov 23, 2023 at 12:12 PM Adam Duskett <
adam.duskett@amarulasolutions.com> wrote:
> Hey Thomas;
>
> lib2 -> glib2
>
> "I think listing the first order dependency is enough." Not sure what you
> mean.
>
> Using the github macro wouldn't work as the release is quite old and lacks
> an absurd amount
> of features and fixes.
>
>
> Adam Duskett
>
> Senior Embedded Systems Developer
>
> adam.duskett@amarulasolutions.com
>
> __________________________________
>
>
> Amarula Solutions BV
>
> Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
>
> T. +31 (0)85 111 9170
> info@amarulasolutions.com
>
> www.amarulasolutions.com
>
>
>
> On Thu, Nov 23, 2023 at 6:44 AM Thomas Petazzoni <
> thomas.petazzoni@bootlin.com> wrote:
>
>> Hello Adam,
>>
>> On Wed, 22 Nov 2023 17:08:08 -0700
>> Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
>>
>> > diff --git a/package/dmenu-wayland/Config.in
>> b/package/dmenu-wayland/Config.in
>> > new file mode 100644
>> > index 0000000000..111bbfb434
>> > --- /dev/null
>> > +++ b/package/dmenu-wayland/Config.in
>> > @@ -0,0 +1,26 @@
>> > +config BR2_PACKAGE_DMENU_WAYLAND
>> > + bool "dmenu-wayland"
>> > + depends on BR2_USE_MMU # pango -> lib2
>>
>> lib2 ?
>>
>> > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
>> > + depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2, wayland
>> > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuz
>> > + depends on !BR2_STATIC_LIBS # wayland -> dlfcn.h
>> > + depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype support
>> > + depends on BR2_USE_WCHAR # pango -> glib2
>>
>> I think listing the first order dependency is enough.
>>
>> > +DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9
>> > +DMENU_WAYLAND_SITE = https://github.com/nyyManni/dmenu-wayland.git
>> > +DMENU_WAYLAND_SITE_METHOD = git
>>
>> Use the github macro?
>>
>> > +DMENU_WAYLAND_LICENSE = MIT
>> > +DMENU_WAYLAND_LICENSE_FILES = LICENSE
>> > +
>> > +DMENU_WAYLAND_DEPENDENCIES = \
>> > + cairo \
>> > + libglib2 \
>> > + libxkbcommon \
>> > + pango \
>> > + wayland \
>> > + wayland-protocols
>> > +
>> > +# By default, sway calls dmenu not dmenu-wl
>> > +define DMENU_WAYLAND_SYMLINK_DMENU_WL
>> > + cd $(TARGET_DIR)/usr/bin && \
>> > + ln -sf dmenu-wl dmenu
>>
>> I think:
>>
>> ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu
>>
>> achieves the same.
>>
>> Thomas
>> --
>> Thomas Petazzoni, co-owner and CEO, Bootlin
>> Embedded Linux and Kernel engineering and training
>> https://bootlin.com
>>
>
[-- Attachment #1.2: Type: text/html, Size: 10204 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 19:13 ` Adam Duskett
@ 2023-11-24 8:43 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-24 8:43 UTC (permalink / raw)
To: Adam Duskett; +Cc: Eric Le Bihan, Raphael Pavlidis, buildroot
Hello,
On Thu, 23 Nov 2023 12:13:32 -0700
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> Forgot to mention, does it really matter if I use
> ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu vs what is there now? Does it
> not achieve the same goal?
Well in:
define DMENU_WAYLAND_SYMLINK_DMENU_WL
cd $(TARGET_DIR)/usr/bin && \
ln -sf dmenu-wl dmenu
endef
the indentation was not correct, so I wanted to point this out. But
while writing this, I realized that:
define DMENU_WAYLAND_SYMLINK_DMENU_WL
ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu
endef
was simpler and cleaner.
I'm not sure how you don't realize that doing directly "ln" is simpler
than cd+ln.
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package
2023-11-23 19:12 ` Adam Duskett
2023-11-23 19:13 ` Adam Duskett
@ 2023-11-24 8:41 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 19+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-24 8:41 UTC (permalink / raw)
To: Adam Duskett; +Cc: Eric Le Bihan, Raphael Pavlidis, buildroot
Hello,
On Thu, 23 Nov 2023 12:12:52 -0700
Adam Duskett <adam.duskett@amarulasolutions.com> wrote:
> lib2 -> glib2
>
> "I think listing the first order dependency is enough." Not sure what you
> mean.
>
> Using the github macro wouldn't work as the release is quite old and lacks
> an absurd amount
> of features and fixes.
You do top-posting and HTML e-mails now? :-)
What I mean by "listing the first order dependency is enough" is that
instead of:
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
you write:
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH/next 03/13] package/tllist: new package
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 01/13] package/sway/Config.in: select BR2_PACKAGE_XKEYBOARD_CONFIG Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 02/13] package/dmenu-wayland: new package Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 04/13] package/fcft: " Adam Duskett
` (9 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/tllist/Config.in | 6 ++++++
package/tllist/tllist.hash | 3 +++
package/tllist/tllist.mk | 16 ++++++++++++++++
5 files changed, 27 insertions(+)
create mode 100644 package/tllist/Config.in
create mode 100644 package/tllist/tllist.hash
create mode 100644 package/tllist/tllist.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 16be3896f8..6eec905365 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -40,6 +40,7 @@ F: package/flutter-pi/
F: package/flutter-sdk-bin/
F: package/python-kmod/
F: package/python-versioneer/
+F: package/tllist/
F: support/testing/tests/package/test_firewalld.py
F: support/testing/tests/package/test_flutter.py
diff --git a/package/Config.in b/package/Config.in
index 790ed3cbd3..c203876a84 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2200,6 +2200,7 @@ endif
source "package/tbb/Config.in"
source "package/tinycbor/Config.in"
source "package/tl-expected/Config.in"
+ source "package/tllist/Config.in"
source "package/tz/Config.in"
source "package/tzdata/Config.in"
source "package/uvw/Config.in"
diff --git a/package/tllist/Config.in b/package/tllist/Config.in
new file mode 100644
index 0000000000..879119d13e
--- /dev/null
+++ b/package/tllist/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_TLLIST
+ bool "tllist"
+ help
+ A C header file only implementation of a typed linked list.
+
+ https://codeberg.org/dnkl/tllist
diff --git a/package/tllist/tllist.hash b/package/tllist/tllist.hash
new file mode 100644
index 0000000000..7858ab6298
--- /dev/null
+++ b/package/tllist/tllist.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 0e7b7094a02550dd80b7243bcffc3671550b0f1d8ba625e4dff52517827d5d23 1.1.0.tar.gz
+sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE
diff --git a/package/tllist/tllist.mk b/package/tllist/tllist.mk
new file mode 100644
index 0000000000..88a28d2427
--- /dev/null
+++ b/package/tllist/tllist.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# tllist
+#
+################################################################################
+
+TLLIST_VERSION = 1.1.0
+TLLIST_SOURCE = $(TLLIST_VERSION).tar.gz
+TLLIST_SITE = https://codeberg.org/dnkl/tllist/archive
+TLLIST_LICENSE = MIT
+TLLIST_LICENSE_FILES = LICENSE
+# header only
+TLLIST_INSTALL_TARGET = NO
+TLLIST_INSTALL_STAGING = YES
+
+$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 04/13] package/fcft: new package
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (2 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 03/13] package/tllist: " Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 05/13] package/libutempter: " Adam Duskett
` (8 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/fcft/Config.in | 52 ++++++++++++++++++++++++++++++++++++++++++
package/fcft/fcft.hash | 3 +++
package/fcft/fcft.mk | 44 +++++++++++++++++++++++++++++++++++
5 files changed, 101 insertions(+)
create mode 100644 package/fcft/Config.in
create mode 100644 package/fcft/fcft.hash
create mode 100644 package/fcft/fcft.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 6eec905365..269cb9e765 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -34,6 +34,7 @@ F: package/vulkan-tools/
N: Adam Duskett <adam.duskett@amarulasolutions.com>
F: package/depot-tools/
F: package/dmenu-wayland/
+F: package/fcft/
F: package/flutter-engine/
F: package/flutter-gallery/
F: package/flutter-pi/
diff --git a/package/Config.in b/package/Config.in
index c203876a84..c40e7ebe2f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2222,6 +2222,7 @@ menu "Text and terminal handling"
source "package/cli11/Config.in"
source "package/docopt-cpp/Config.in"
source "package/enchant/Config.in"
+ source "package/fcft/Config.in"
source "package/fmt/Config.in"
source "package/fstrcmp/Config.in"
source "package/icu/Config.in"
diff --git a/package/fcft/Config.in b/package/fcft/Config.in
new file mode 100644
index 0000000000..b65515a3f1
--- /dev/null
+++ b/package/fcft/Config.in
@@ -0,0 +1,52 @@
+config BR2_PACKAGE_FCFT
+ bool "fcft"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_PIXMAN
+ select BR2_PACKAGE_TLLIST
+ help
+ A simple library for font loading and glyph rasterization
+ using FontConfig, FreeType and pixman.
+
+ https://codeberg.org/dnkl/fcft
+
+if BR2_PACKAGE_FCFT
+
+config BR2_PACKAGE_FCFT_GRAPHEME_SHAPING
+ bool "grapheme-shaping"
+ depends on BR2_INSTALL_LIBSTDCPP # harfbuzz
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz
+ select BR2_PACKAGE_HARFBUZZ
+ help
+ Enables shaping of individual grapheme clusters
+
+comment "grapheme-shaping needs a toolchain w/ C++, gcc >= 4.9"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_PACKAGE_FCFT_RUN_SHAPING
+ bool "run-shaping"
+ depends on BR2_INSTALL_LIBSTDCPP # harfbuzz
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz
+ select BR2_PACKAGE_HARFBUZZ
+ select BR2_PACKAGE_UTF8PROC
+ help
+ Enables shaping of whole text runs.
+
+comment "run-shaping needs a toolchain w/ C++, gcc >= 4.9"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_PACKAGE_FCFT_SVG_SUPPORT
+ bool "svg support"
+ help
+ Enables svg support. This option increases the size of the
+ library by approximately 55KB.
+
+endif # BR2_PACKAGE_FCFT
+
+comment "fcft needs a toolchain w/ threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/fcft/fcft.hash b/package/fcft/fcft.hash
new file mode 100644
index 0000000000..239c2e0e6d
--- /dev/null
+++ b/package/fcft/fcft.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 95797f945faf407cb658efe6e5dcf0cc3ab08ef01e159383f9cf7cf5ee257506 3.1.6.tar.gz
+sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE
diff --git a/package/fcft/fcft.mk b/package/fcft/fcft.mk
new file mode 100644
index 0000000000..538d8a0748
--- /dev/null
+++ b/package/fcft/fcft.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# fcft
+#
+################################################################################
+
+FCFT_VERSION = 3.1.6
+FCFT_SOURCE = $(FCFT_VERSION).tar.gz
+FCFT_SITE = https://codeberg.org/dnkl/fcft/archive
+FCFT_LICENSE = MIT
+FCFT_LICENSE_FILES = LICENSE
+FCFT_INSTALL_STAGING = YES
+
+FCFT_DEPENDENCIES = \
+ fontconfig \
+ freetype \
+ pixman \
+ tllist
+
+FCFT_CONF_OPTS = \
+ -Ddocs=disabled \
+ -Dexamples=false
+
+ifeq ($(BR2_PACKAGE_FCFT_GRAPHEME_SHAPING),y)
+FCFT_DEPENDENCIES += harfbuzz
+FCFT_CONF_OPTS += -Dgrapheme-shaping=enabled
+else
+FCFT_CONF_OPTS += -Dgrapheme-shaping=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_FCFT_RUN_SHAPING),y)
+FCFT_DEPENDENCIES += harfbuzz utf8proc
+FCFT_CONF_OPTS += -Drun-shaping=enabled
+else
+FCFT_CONF_OPTS += -Drun-shaping=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_FCFT_SVG_SUPPORT),y)
+FCFT_CONF_OPTS += -Dsvg-backend='nanosvg'
+else
+FCFT_CONF_OPTS += -Dsvg-backend='none'
+endif
+
+$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 05/13] package/libutempter: new package
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (3 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 04/13] package/fcft: " Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 06/13] package/foot: " Adam Duskett
` (7 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
.../0001-force-symlink-creation.patch | 36 +++++++++++++++++++
package/libutempter/Config.in | 11 ++++++
package/libutempter/libutempter.hash | 3 ++
package/libutempter/libutempter.mk | 27 ++++++++++++++
6 files changed, 79 insertions(+)
create mode 100644 package/libutempter/0001-force-symlink-creation.patch
create mode 100644 package/libutempter/Config.in
create mode 100644 package/libutempter/libutempter.hash
create mode 100644 package/libutempter/libutempter.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 269cb9e765..a8cdd8e5a9 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -39,6 +39,7 @@ F: package/flutter-engine/
F: package/flutter-gallery/
F: package/flutter-pi/
F: package/flutter-sdk-bin/
+F: package/libutempter/
F: package/python-kmod/
F: package/python-versioneer/
F: package/tllist/
diff --git a/package/Config.in b/package/Config.in
index c40e7ebe2f..6d0e84c4c4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2161,6 +2161,7 @@ menu "Other"
source "package/libunwind/Config.in"
source "package/liburcu/Config.in"
source "package/liburing/Config.in"
+ source "package/libutempter/Config.in"
source "package/libuv/Config.in"
source "package/lightning/Config.in"
source "package/linux-pam/Config.in"
diff --git a/package/libutempter/0001-force-symlink-creation.patch b/package/libutempter/0001-force-symlink-creation.patch
new file mode 100644
index 0000000000..c30928afd5
--- /dev/null
+++ b/package/libutempter/0001-force-symlink-creation.patch
@@ -0,0 +1,36 @@
+From 13e0a4ca67d860bc8f1e3b2ad6a3926758d76b47 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <adam.duskett@amarulasolutions.com>
+Date: Wed, 22 Nov 2023 14:09:13 -0700
+Subject: [PATCH] force symlink creation
+
+Force symlink creation to avoid errors when reinstalling
+
+Upstream: https://github.com/altlinux/libutempter/pull/5
+Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8c90121..1cfc627 100644
+--- a/Makefile
++++ b/Makefile
+@@ -83,12 +83,12 @@ install:
+ $(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/
+ $(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
+ $(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/
+- ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
+- ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
++ ln -sf $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
++ ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
+ $(INSTALL) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/
+ for n in lib$(PROJECT) utempter_add_record utempter_remove_record \
+ utempter_remove_added_record utempter_set_helper; do \
+- ln -s $(PROJECT).3 $(DESTDIR)$(man3dir)/$$n.3; \
++ ln -sf $(PROJECT).3 $(DESTDIR)$(man3dir)/$$n.3; \
+ done
+
+ clean:
+--
+2.42.0
+
diff --git a/package/libutempter/Config.in b/package/libutempter/Config.in
new file mode 100644
index 0000000000..a06a240418
--- /dev/null
+++ b/package/libutempter/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBUTEMPTER
+ bool "libutempter"
+ help
+ The libutempter library provides interface for terminal
+ emulators such as screen and xterm to record user
+ sessions to utmp and wtmp files.
+
+ http://ftp.altlinux.org/pub/people/ldv/utempter/
+
+comment "libutempter needs a toolchain w/ headers >= 4.14, dynamic library"
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS
diff --git a/package/libutempter/libutempter.hash b/package/libutempter/libutempter.hash
new file mode 100644
index 0000000000..53a6c6db63
--- /dev/null
+++ b/package/libutempter/libutempter.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 967fef372f391de501843ad87570c6cf5dabd9651f00f1783090fbc12b2a34cb libutempter-1.2.1.tar.gz
+sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING
diff --git a/package/libutempter/libutempter.mk b/package/libutempter/libutempter.mk
new file mode 100644
index 0000000000..2ce0bcd7c9
--- /dev/null
+++ b/package/libutempter/libutempter.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libutempter
+#
+################################################################################
+
+LIBUTEMPTER_VERSION = 1.2.1
+LIBUTEMPTER_SITE = ftp.altlinux.org/pub/people/ldv/utempter
+LIBUTEMPTER_INSTALL_STAGING = YES
+LIBUTEMPTER_LICENSE = LGPL-2.1
+LIBUTEMPTER_LICENSE_FILES = COPYING
+
+define LIBUTEMPTER_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define LIBUTEMPTER_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+ $(MAKE) DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/ install
+endef
+
+define LIBUTEMPTER_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+ $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/ install
+endef
+
+$(eval $(generic-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 06/13] package/foot: new package
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (4 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 05/13] package/libutempter: " Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 07/13] package/ncurses: install foot terminfo if foot is selected Adam Duskett
` (6 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
This is the default terminal sway uses.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
| 36 +++++++++++++++++++++++++++++
| 3 +++
| 51 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 92 insertions(+)
create mode 100644 package/foot/Config.in
create mode 100644 package/foot/foot.hash
create mode 100644 package/foot/foot.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index a8cdd8e5a9..f368cb5d06 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -35,6 +35,7 @@ N: Adam Duskett <adam.duskett@amarulasolutions.com>
F: package/depot-tools/
F: package/dmenu-wayland/
F: package/fcft/
+F: package/foot/
F: package/flutter-engine/
F: package/flutter-gallery/
F: package/flutter-pi/
diff --git a/package/Config.in b/package/Config.in
index 6d0e84c4c4..891a862349 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -314,6 +314,7 @@ comment "Graphic applications"
source "package/cage/Config.in"
source "package/cog/Config.in"
source "package/dmenu-wayland/Config.in"
+ source "package/foot/Config.in"
source "package/fswebcam/Config.in"
source "package/ghostscript/Config.in"
source "package/glmark2/Config.in"
--git a/package/foot/Config.in b/package/foot/Config.in
new file mode 100644
index 0000000000..a3894c5469
--- /dev/null
+++ b/package/foot/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_FOOT
+ bool "foot"
+ depends on !BR2_STATIC_LIBS # wayland -> dlfcn.h
+ depends on BR2_TOOLCHAIN_HAS_THREADS # fcft, wayland
+ select BR2_PACKAGE_FCFT
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_LIBXKBCOMMON
+ select BR2_PACKAGE_PIXMAN
+ select BR2_PACKAGE_TLLIST
+ select BR2_PACKAGE_WAYLAND
+ select BR2_PACKAGE_WAYLAND_PROTOCOLS
+ help
+ A fast, lightweight and minimalistic Wayland terminal
+ emulator.
+ NOTE: foot needs a working UTF-8 locale (BR2_GENERATE_LOCALE)
+
+ https://codeberg.org/dnkl/foot
+
+if BR2_PACKAGE_FOOT
+
+config BR2_PACKAGE_FOOT_GRAPHEME_CLUSTERING
+ bool "grapheme-clustering"
+ select BR2_PACKAGE_UTF8PROC
+ help
+ Enables grapheme clustering.
+
+config BR2_PACKAGE_FOOT_THEMES
+ bool "themes"
+ help
+ Install themes (predefined color schemes)
+
+endif # BR2_PACKAGE_FOOT
+
+comment "foot needs a toolchain w/ dynamic library, threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
--git a/package/foot/foot.hash b/package/foot/foot.hash
new file mode 100644
index 0000000000..1b99ed9518
--- /dev/null
+++ b/package/foot/foot.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 0e02af376e5f4a96eeb90470b7ad2e79a1d660db2a7d1aa772be43c7db00e475 1.16.2.tar.gz
+sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE
--git a/package/foot/foot.mk b/package/foot/foot.mk
new file mode 100644
index 0000000000..ab965bedf5
--- /dev/null
+++ b/package/foot/foot.mk
@@ -0,0 +1,51 @@
+################################################################################
+#
+# foot
+#
+################################################################################
+
+FOOT_VERSION = 1.16.2
+FOOT_SOURCE = $(FOOT_VERSION).tar.gz
+FOOT_SITE = https://codeberg.org/dnkl/foot/archive
+FOOT_LICENSE = MIT
+FOOT_LICENSE_FILES = LICENSE
+FOOT_DEPENDENCIES = \
+ fcft \
+ fontconfig \
+ freetype \
+ libutempter \
+ libxkbcommon \
+ pixman \
+ tllist \
+ wayland \
+ wayland-protocols
+
+FOOT_CONF_OPTS = \
+ -Ddocs=disabled \
+ -Dtests=false
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+FOOT_DEPENDENCIES += systemd
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUTEMPTER),y)
+FOOT_DEPENDENCIES += libutempter
+FOOT_CONF_OPTS += -Dutmp-backend='libutempter'
+else
+FOOT_CONF_OPTS += -Dutmp-backend='none'
+endif
+
+ifeq ($(BR2_PACKAGE_FOOT_GRAPHEME_CLUSTERING),y)
+FOOT_DEPENDENCIES += utf8proc
+FOOT_CONF_OPTS += -Dgrapheme-clustering=enabled
+else
+FOOT_CONF_OPTS += -Dgrapheme-clustering=disabled
+endif
+
+ifeq ($(BR2_PACKAGE_FOOT_THEMES),y)
+FOOT_CONF_OPTS += -Dthemes=true
+else
+FOOT_CONF_OPTS += -Dthemes=false
+endif
+
+$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 07/13] package/ncurses: install foot terminfo if foot is selected
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (5 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 06/13] package/foot: " Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 08/13] package/sway: enable bash-completion support Adam Duskett
` (5 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
From foot/INSTALL.md:
```
As of ncurses 2021-07-31, ncurses includes a version of foot’s
terminfo. **The recommendation is to use those**, and only install the
terminfo definitions from this git repo if the system’s ncurses
predates 2021-07-31.
```
So it is best to follow the instructions and install the foot terminfo
provided by ncurses.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/ncurses/ncurses.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 3b805cb1fd..00e1c0d424 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -73,6 +73,13 @@ NCURSES_TERMINFO_FILES = \
x/xterm-xfree86 \
$(call qstrip,$(BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO))
+ifeq ($(BR2_PACKAGE_FOOT),y)
+NCURSES_TERMINFO_FILES += \
+ f/foot \
+ f/foot+base \
+ f/foot-direct
+endif
+
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
NCURSES_CONF_OPTS += --enable-widec
NCURSES_LIB_SUFFIX = w
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 08/13] package/sway: enable bash-completion support
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (6 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 07/13] package/ncurses: install foot terminfo if foot is selected Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 09/13] package/sway: enable default-wallpaper support Adam Duskett
` (4 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/sway.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index 19f90b8b00..677b101f1d 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \
-Dwerror=false \
-Ddefault-wallpaper=false \
-Dzsh-completions=false \
- -Dbash-completions=false \
-Dfish-completions=false \
-Dswaybar=false \
-Dswaynag=false \
@@ -34,4 +33,10 @@ else
SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled
endif
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+SWAY_CONF_OPTS += -Dbash-completions=true
+else
+SWAY_CONF_OPTS += -Dbash-completions=false
+endif
+
$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 09/13] package/sway: enable default-wallpaper support
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (7 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 08/13] package/sway: enable bash-completion support Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 10/13] package/sway: enable swaybar support Adam Duskett
` (3 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Add a config option to enable the default-wallpaper.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 8 ++++++++
package/sway/sway.mk | 7 ++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index 7c1e849bbc..950ad82b05 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -26,6 +26,14 @@ config BR2_PACKAGE_SWAY
https://github.com/swaywm/sway
+if BR2_PACKAGE_SWAY
+
+config BR2_PACKAGE_SWAY_DEFAULT_WALLPAPER
+ bool "Install default wallpaper"
+ select BR2_PACKAGE_SWAYBG
+
+endif # BR2_PACKAGE_SWAY
+
comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support"
depends on !BR2_PACKAGE_SYSTEMD || \
!BR2_PACKAGE_HAS_UDEV || \
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index 677b101f1d..e2065c4d4f 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -11,7 +11,6 @@ SWAY_LICENSE_FILES = LICENSE
SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango
SWAY_CONF_OPTS = \
-Dwerror=false \
- -Ddefault-wallpaper=false \
-Dzsh-completions=false \
-Dfish-completions=false \
-Dswaybar=false \
@@ -39,4 +38,10 @@ else
SWAY_CONF_OPTS += -Dbash-completions=false
endif
+ifeq ($(BR2_PACKAGE_SWAY_DEFAULT_WALLPAPER),y)
+SWAY_CONF_OPTS += -Ddefault-wallpaper=true
+else
+SWAY_CONF_OPTS += -Ddefault-wallpaper=false
+endif
+
$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 10/13] package/sway: enable swaybar support
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (8 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 09/13] package/sway: enable default-wallpaper support Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 11/13] package/sway: enable swaybar tray support Adam Duskett
` (2 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Add a config option to build sway with swaybar support.
- The bar requires dejavu fonts.
- If bash-completions is selected, JQ is required.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 7 +++++++
package/sway/sway.mk | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index 950ad82b05..4e3bf576a4 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -32,6 +32,13 @@ config BR2_PACKAGE_SWAY_DEFAULT_WALLPAPER
bool "Install default wallpaper"
select BR2_PACKAGE_SWAYBG
+config BR2_PACKAGE_SWAY_SWAYBAR
+ bool "swaybar"
+ select BR2_PACKAGE_DEJAVU
+ select BR2_PACKAGE_JQ if BR2_PACKAGE_BASH_COMPLETION
+ help
+ Enable support for swaybar
+
endif # BR2_PACKAGE_SWAY
comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support"
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index e2065c4d4f..12b039885f 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \
-Dwerror=false \
-Dzsh-completions=false \
-Dfish-completions=false \
- -Dswaybar=false \
-Dswaynag=false \
-Dtray=disabled \
-Dman-pages=disabled \
@@ -44,4 +43,10 @@ else
SWAY_CONF_OPTS += -Ddefault-wallpaper=false
endif
+ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR),y)
+SWAY_CONF_OPTS += -Dswaybar=true
+else
+SWAY_CONF_OPTS += -Dswaybar=false
+endif
+
$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 11/13] package/sway: enable swaybar tray support
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (9 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 10/13] package/sway: enable swaybar support Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 12/13] package/sway: enable swaynag support Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 13/13] package/sway/Config.in: Add a help note about the default terminal Adam Duskett
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Add a config option to build swaybar with tray support.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 9 +++++++++
package/sway/sway.mk | 7 ++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index 4e3bf576a4..eef9b2a74d 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -39,6 +39,15 @@ config BR2_PACKAGE_SWAY_SWAYBAR
help
Enable support for swaybar
+if BR2_PACKAGE_SWAY_SWAYBAR
+
+config BR2_PACKAGE_SWAY_SWAYBAR_TRAY
+ bool "swaybar tray"
+ help
+ Enable support for swaybar tray
+
+endif # BR2_PACKAGE_SWAY_SWAYBAR
+
endif # BR2_PACKAGE_SWAY
comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support"
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index 12b039885f..39098797eb 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -14,7 +14,6 @@ SWAY_CONF_OPTS = \
-Dzsh-completions=false \
-Dfish-completions=false \
-Dswaynag=false \
- -Dtray=disabled \
-Dman-pages=disabled \
-Dsd-bus-provider=libsystemd
@@ -49,4 +48,10 @@ else
SWAY_CONF_OPTS += -Dswaybar=false
endif
+ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y)
+SWAY_CONF_OPTS += -Dtray=enabled
+else
+SWAY_CONF_OPTS += -Dtray=disabled
+endif
+
$(eval $(meson-package))
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 12/13] package/sway: enable swaynag support
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (10 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 11/13] package/sway: enable swaybar tray support Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
2023-11-23 0:08 ` [Buildroot] [PATCH/next 13/13] package/sway/Config.in: Add a help note about the default terminal Adam Duskett
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
Add a config option to build sway with swaynag support.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 5 +++++
package/sway/sway.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index eef9b2a74d..3c573f83d5 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -48,6 +48,11 @@ config BR2_PACKAGE_SWAY_SWAYBAR_TRAY
endif # BR2_PACKAGE_SWAY_SWAYBAR
+config BR2_PACKAGE_SWAY_SWAYNAG
+ bool "swaynag"
+ help
+ Enable support for swaynag
+
endif # BR2_PACKAGE_SWAY
comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support"
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index 39098797eb..7e1bd61a40 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \
-Dwerror=false \
-Dzsh-completions=false \
-Dfish-completions=false \
- -Dswaynag=false \
-Dman-pages=disabled \
-Dsd-bus-provider=libsystemd
@@ -48,6 +47,12 @@ else
SWAY_CONF_OPTS += -Dswaybar=false
endif
+ifeq ($(BR2_PACKAGE_SWAY_SWAYNAG),y)
+SWAY_CONF_OPTS += -Dswaynag=true
+else
+SWAY_CONF_OPTS += -Dswaynag=false
+endif
+
ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y)
SWAY_CONF_OPTS += -Dtray=enabled
else
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH/next 13/13] package/sway/Config.in: Add a help note about the default terminal
2023-11-23 0:08 [Buildroot] [PATCH 00/13] Sway fixups Adam Duskett
` (11 preceding siblings ...)
2023-11-23 0:08 ` [Buildroot] [PATCH/next 12/13] package/sway: enable swaynag support Adam Duskett
@ 2023-11-23 0:08 ` Adam Duskett
12 siblings, 0 replies; 19+ messages in thread
From: Adam Duskett @ 2023-11-23 0:08 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Raphael Pavlidis, Thomas Petazzoni
The default terminal used by sway is the foot terminal. Add a note in
the Config.in explaining that if a user is using the default sway config,
it is recommended to also enable the foot package.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/sway/Config.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/sway/Config.in b/package/sway/Config.in
index 3c573f83d5..b662e04bd3 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -23,6 +23,10 @@ config BR2_PACKAGE_SWAY
select BR2_PACKAGE_XKEYBOARD_CONFIG # Runtime dependency
help
i3-compatible Wayland compositor
+ Note:
+ The default sway config uses the foot package as the
+ default terminal. If you plan on using the default
+ config, it is recommended to select the foot package!
https://github.com/swaywm/sway
--
2.42.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread