* [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND
@ 2022-09-24 15:07 Thomas Petazzoni
2022-09-24 15:37 ` Yann E. MORIN
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2022-09-24 15:07 UTC (permalink / raw)
To: Buildroot List
Cc: Bernd Kuhls, Gary Bisson, Fabrice Fontaine, Refik Tuzakli,
Thomas Petazzoni, Adrian Perez de Castro, Romain Naour,
Yann E. MORIN
Since Wayland 15 (upstream commit
549a5ea710f4da1a5749587176d39fef1ded4077), libwayland-egl.so is
provided by the wayland package, so there is no longer a question of
whether libwayland-egl.so is provided by the particular EGL
implementation. See the Wayland commit log:
wayland-egl: import libwayland-egl.so frontend library from Mesa
Currently the client-facing libwayland-egl API is defined by a header
file shipped by Wayland, but the implementation is left to each vendor.
This can cause collisions when multiple implementations are installed on
the same system. Importing the implementation into Wayland with a stable
and versioned driver-facing ABI allows multiple drivers to coexist on
the same system.
Pull the sample implementation from Mesa commit 677edff5cfd
("wayland-egl: rework and simplify wl_egl_window initialization")
It has been used by the Mesa open source drivers, NVIDIA and others[1].
v2: Reword commit message, rebase on top of newer Mesa.
[1] https://github.com/thayama/wayland-egl
Consequently, we remove the BR2_PACKAGE_HAS_LIBEGL_WAYLAND
option. Packages that rely on BR2_PACKAGE_HAS_LIBGLES and
BR2_PACKAGE_WAYLAND are guaranteed to have libwayland-egl.so.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/cage/Config.in | 4 +---
package/freescale-imx/imx-gpu-viv/Config.in | 1 -
package/kodi/Config.in | 1 -
package/libgtk3/Config.in | 8 ++++----
package/mesa3d/Config.in | 1 -
package/nvidia-driver/Config.in | 1 -
package/opengl/libegl/Config.in | 4 ----
package/vte/Config.in | 6 +++---
package/waffle/Config.in | 2 +-
package/waylandpp/Config.in | 6 +++---
package/weston/Config.in | 6 +++---
package/weston/weston.mk | 2 +-
package/wlroots/Config.in | 5 ++---
package/wpebackend-fdo/Config.in | 6 +++---
package/wpewebkit/Config.in | 4 +---
15 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/package/cage/Config.in b/package/cage/Config.in
index 0844d6ff62..4f823c768c 100644
--- a/package/cage/Config.in
+++ b/package/cage/Config.in
@@ -1,6 +1,5 @@
-comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support"
+comment "cage needs udev, EGL and OpenGL ES support"
depends on !BR2_PACKAGE_HAS_LIBEGL || \
- !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
!BR2_PACKAGE_HAS_LIBGLES || \
!BR2_PACKAGE_HAS_UDEV
@@ -13,7 +12,6 @@ config BR2_PACKAGE_CAGE
depends on !BR2_STATIC_LIBS # wlroots
depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
depends on BR2_PACKAGE_HAS_LIBEGL # wlroots
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots
depends on BR2_PACKAGE_HAS_LIBGLES # wlroots
depends on BR2_PACKAGE_HAS_UDEV # wlroots
select BR2_PACKAGE_WLROOTS
diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in
index 9ba3d0428e..fc59d9a548 100644
--- a/package/freescale-imx/imx-gpu-viv/Config.in
+++ b/package/freescale-imx/imx-gpu-viv/Config.in
@@ -64,7 +64,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB
config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
bool "Wayland"
select BR2_PACKAGE_WAYLAND
- select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
endchoice
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 90710683db..1b1f39895e 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -31,7 +31,6 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND
bool
default y
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp
depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp
depends on BR2_INSTALL_LIBSTDCPP # waylandpp
diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
index bc8cacd9f5..41fe3dd64c 100644
--- a/package/libgtk3/Config.in
+++ b/package/libgtk3/Config.in
@@ -6,10 +6,10 @@ comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9"
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_TOOLCHAIN_HAS_THREADS
-comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend"
+comment "libgtk3 needs an OpenGL or an OpenGL-EGL backend"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \
+ depends on !BR2_PACKAGE_HAS_LIBEGL && \
!BR2_PACKAGE_HAS_LIBGL
config BR2_PACKAGE_LIBGTK3
@@ -21,7 +21,7 @@ config BR2_PACKAGE_LIBGTK3
depends on BR2_INSTALL_LIBSTDCPP # pango
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+ depends on BR2_PACKAGE_HAS_LIBEGL || \
BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_ATK
select BR2_PACKAGE_CAIRO
@@ -69,7 +69,7 @@ comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h
config BR2_PACKAGE_LIBGTK3_WAYLAND
bool "Wayland GDK backend"
default y
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on BR2_PACKAGE_HAS_LIBEGL
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
select BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_WAYLAND_PROTOCOLS
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 40f7009492..e379255a01 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -378,7 +378,6 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND
select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND
- select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
select BR2_PACKAGE_MESA3D_GBM
help
Use the Khronos EGL APIs. EGL is a window manager for OpenGL
diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in
index a8617a939b..e4a9dde0a0 100644
--- a/package/nvidia-driver/Config.in
+++ b/package/nvidia-driver/Config.in
@@ -26,7 +26,6 @@ config BR2_PACKAGE_NVIDIA_DRIVER_XORG
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_HAS_LIBEGL
- select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
select BR2_PACKAGE_HAS_LIBGLES
if BR2_PACKAGE_NVIDIA_DRIVER_XORG
diff --git a/package/opengl/libegl/Config.in b/package/opengl/libegl/Config.in
index a236998947..f46d09ed71 100644
--- a/package/opengl/libegl/Config.in
+++ b/package/opengl/libegl/Config.in
@@ -1,10 +1,6 @@
config BR2_PACKAGE_HAS_LIBEGL
bool
-config BR2_PACKAGE_HAS_LIBEGL_WAYLAND
- bool
- depends on BR2_PACKAGE_HAS_LIBEGL
-
config BR2_PACKAGE_PROVIDES_LIBEGL
string
depends on BR2_PACKAGE_HAS_LIBEGL
diff --git a/package/vte/Config.in b/package/vte/Config.in
index 45d627885f..8a231a21af 100644
--- a/package/vte/Config.in
+++ b/package/vte/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_VTE
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_USES_MUSL
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+ depends on BR2_PACKAGE_HAS_LIBEGL || \
BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBGTK3
@@ -31,9 +31,9 @@ comment "vte needs a uClibc or glibc toolchain w/ wchar, threads, C++, gcc >= 10
!BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \
BR2_TOOLCHAIN_USES_MUSL
-comment "vte needs an OpenGL or an OpenGL-EGL/wayland backend"
+comment "vte needs an OpenGL or an OpenGL-EGL backend"
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \
+ depends on !BR2_PACKAGE_HAS_LIBEGL && \
!BR2_PACKAGE_HAS_LIBGL
diff --git a/package/waffle/Config.in b/package/waffle/Config.in
index ad622e9582..79cb4ca2ed 100644
--- a/package/waffle/Config.in
+++ b/package/waffle/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_WAFFLE_SUPPORTS_GLX
config BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND
bool
- default y if BR2_PACKAGE_WAYLAND && BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ default y if BR2_PACKAGE_WAYLAND && BR2_PACKAGE_HAS_LIBEGL
config BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL
bool
diff --git a/package/waylandpp/Config.in b/package/waylandpp/Config.in
index 86ca965056..0713884d3e 100644
--- a/package/waylandpp/Config.in
+++ b/package/waylandpp/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_WAYLANDPP
bool "waylandpp"
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on BR2_PACKAGE_HAS_LIBEGL
depends on BR2_HOST_GCC_AT_LEAST_4_9
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_INSTALL_LIBSTDCPP
@@ -10,9 +10,9 @@ config BR2_PACKAGE_WAYLANDPP
https://github.com/NilsBrause/waylandpp
-comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support"
+comment "waylandpp needs an OpenGL-EGL backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9, C++ support"
depends on BR2_PACKAGE_WAYLAND
- depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+ depends on !BR2_PACKAGE_HAS_LIBEGL || \
!BR2_HOST_GCC_AT_LEAST_4_9 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_INSTALL_LIBSTDCPP
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 3b4e932b7d..cba0469d16 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -152,16 +152,16 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS
depends on BR2_TOOLCHAIN_HAS_THREADS # pango
depends on BR2_USE_WCHAR # pango
depends on BR2_PACKAGE_HAS_LIBGLES
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_PANGO
help
This enables the installation of Weston's demo clients.
-comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
+comment "demo clients needs an OpenGL ES/EGL provider and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \
- !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+ !BR2_PACKAGE_HAS_LIBEGL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
endif
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 5e71473640..1c7c8a98df 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -71,7 +71,7 @@ else
WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false
endif
-ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
+ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
WESTON_CONF_OPTS += -Drenderer-gl=true
WESTON_DEPENDENCIES += libegl libgles
ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in
index 84a4ef846e..de45c0c583 100644
--- a/package/wlroots/Config.in
+++ b/package/wlroots/Config.in
@@ -1,6 +1,6 @@
-comment "wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support"
+comment "wlroots needs udev, EGL and OpenGL ES support"
depends on !BR2_PACKAGE_HAS_LIBEGL || \
- !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+ !BR2_PACKAGE_HAS_LIBEGL || \
!BR2_PACKAGE_HAS_LIBGLES || \
!BR2_PACKAGE_HAS_UDEV
@@ -14,7 +14,6 @@ config BR2_PACKAGE_WLROOTS
depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland
depends on BR2_PACKAGE_HAS_UDEV # libinput
depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
depends on BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBINPUT
diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in
index 8a8c820c9b..9b4dd28741 100644
--- a/package/wpebackend-fdo/Config.in
+++ b/package/wpebackend-fdo/Config.in
@@ -1,5 +1,5 @@
-comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable Wayland backend"
- depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
+comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and EGL support"
+ depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
config BR2_PACKAGE_WPEBACKEND_FDO
@@ -9,7 +9,7 @@ config BR2_PACKAGE_WPEBACKEND_FDO
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_USE_MMU # libglib2
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_LIBEPOXY
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBWPE
diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in
index 04ed40bd92..2a5905a30a 100644
--- a/package/wpewebkit/Config.in
+++ b/package/wpewebkit/Config.in
@@ -27,8 +27,7 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc
comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend"
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
depends on !BR2_BINFMT_FLAT
- depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \
- || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+ depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL
config BR2_PACKAGE_WPEWEBKIT
bool "wpewebkit"
@@ -41,7 +40,6 @@ config BR2_PACKAGE_WPEWEBKIT
depends on BR2_USE_WCHAR # icu, libsoup
depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy
depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy
- depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PNG
--
2.37.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND
2022-09-24 15:07 [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND Thomas Petazzoni
@ 2022-09-24 15:37 ` Yann E. MORIN
2022-09-24 21:00 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2022-09-24 15:37 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Bernd Kuhls, Gary Bisson, Refik Tuzakli, Buildroot List,
Adrian Perez de Castro, Romain Naour, Fabrice Fontaine
Thomas, All,
On 2022-09-24 17:07 +0200, Thomas Petazzoni spake thusly:
> Since Wayland 15 (upstream commit
I guess you meant wayland 1.15.0 ? ;-)
[--SNIP--]
> diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in
> index a8617a939b..e4a9dde0a0 100644
> --- a/package/nvidia-driver/Config.in
> +++ b/package/nvidia-driver/Config.in
> @@ -26,7 +26,6 @@ config BR2_PACKAGE_NVIDIA_DRIVER_XORG
> select BR2_PACKAGE_XLIB_LIBXEXT
> select BR2_PACKAGE_HAS_LIBGL
> select BR2_PACKAGE_HAS_LIBEGL
> - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
So, what I understood from upstream commit log, was that NVIdia driver
does have a libwayland-egl, but our nvidia-driver does not install one.
So, there seems to be no conflict. Still, this is strange that our
nvidia-driver did select BR2_PACKAGE_HAS_LIBEGL_WAYLAND without
installing libwayland-egl.so...
[--SNIP--]
> diff --git a/package/vte/Config.in b/package/vte/Config.in
> index 45d627885f..8a231a21af 100644
> --- a/package/vte/Config.in
> +++ b/package/vte/Config.in
> @@ -8,7 +8,7 @@ config BR2_PACKAGE_VTE
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20
> depends on BR2_TOOLCHAIN_HAS_SYNC_4
> depends on !BR2_TOOLCHAIN_USES_MUSL
> - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
> + depends on BR2_PACKAGE_HAS_LIBEGL || \
I am not sure this is equivalent in this case: indeed, it is possivble
to have EGL without having wayland enabled, and there currently is
nothing that enforces wayland to be enabled for vte, even conditionally.
[--SNIP--]
> diff --git a/package/weston/Config.in b/package/weston/Config.in
> index 3b4e932b7d..cba0469d16 100644
> --- a/package/weston/Config.in
> +++ b/package/weston/Config.in
> @@ -152,16 +152,16 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS
> depends on BR2_TOOLCHAIN_HAS_THREADS # pango
> depends on BR2_USE_WCHAR # pango
> depends on BR2_PACKAGE_HAS_LIBGLES
> - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
> + depends on BR2_PACKAGE_HAS_LIBEGL
> select BR2_PACKAGE_PANGO
> help
> This enables the installation of Weston's demo clients.
>
> -comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> +comment "demo clients needs an OpenGL ES/EGL provider and a toolchain w/ wchar, threads, C++, gcc >= 4.9"
> depends on BR2_USE_MMU
> depends on BR2_TOOLCHAIN_HAS_SYNC_4
> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
> !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \
> - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
> + !BR2_PACKAGE_HAS_LIBEGL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
>
> endif
> diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> index 5e71473640..1c7c8a98df 100644
> --- a/package/weston/weston.mk
> +++ b/package/weston/weston.mk
> @@ -71,7 +71,7 @@ else
> WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false
> endif
>
> -ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
> +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
Why can we drop the BR2_PACKAGE_HAS_LIBEGL entirely here?
As far as I can see and remember, the two are orthogonal (even if GLES
is in practice most often used in conjunction with EGL rather than full
GL).
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND
2022-09-24 15:37 ` Yann E. MORIN
@ 2022-09-24 21:00 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2022-09-24 21:00 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Bernd Kuhls, Gary Bisson, Refik Tuzakli, Buildroot List,
Adrian Perez de Castro, Romain Naour, Fabrice Fontaine
Hello Yann,
Thanks for the review!
On Sat, 24 Sep 2022 17:37:29 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> So, what I understood from upstream commit log, was that NVIdia driver
> does have a libwayland-egl, but our nvidia-driver does not install one.
>
> So, there seems to be no conflict. Still, this is strange that our
> nvidia-driver did select BR2_PACKAGE_HAS_LIBEGL_WAYLAND without
> installing libwayland-egl.so...
It just works because libwayland-egl.so is now provided by the wayland
package.
> > - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
> > + depends on BR2_PACKAGE_HAS_LIBEGL || \
>
> I am not sure this is equivalent in this case: indeed, it is possivble
> to have EGL without having wayland enabled, and there currently is
> nothing that enforces wayland to be enabled for vte, even conditionally.
In the context of package/vte, the depends on
BR2_PACKAGE_LIBEGL_WAYLAND was useless. Look:
depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_XORG7
See the "depends on BR2_PACKAGE_XORG7" ? So we certainly cannot be in a
wayland situation with the vte package. So you might wonder why there
is a depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND. Simply because it is a
dependency inherited from libgtk3.
So my patch is simply propagating again the dependency from libgtk3 to
vte.
> > diff --git a/package/weston/weston.mk b/package/weston/weston.mk
> > index 5e71473640..1c7c8a98df 100644
> > --- a/package/weston/weston.mk
> > +++ b/package/weston/weston.mk
> > @@ -71,7 +71,7 @@ else
> > WESTON_CONF_OPTS += -Ddeprecated-weston-launch=false
> > endif
> >
> > -ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
> > +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
>
> Why can we drop the BR2_PACKAGE_HAS_LIBEGL entirely here?
>
> As far as I can see and remember, the two are orthogonal (even if GLES
> is in practice most often used in conjunction with EGL rather than full
> GL).
That's a very good point, I'll fix that and send a v2. Thanks!
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] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND
@ 2023-10-10 14:34 Thomas Devoogdt
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Devoogdt @ 2023-10-10 14:34 UTC (permalink / raw)
To: buildroot
Hi Thomas, Yann, All,
What is the status of this patch? It seems useful to have
libegl/libgbm support in mesa without pulling in Wayland. Especially
for WebKitGTK,
Kr,
Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-10 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-24 15:07 [Buildroot] [PATCH] package/opengl/libegl: remove BR2_PACKAGE_HAS_LIBEGL_WAYLAND Thomas Petazzoni
2022-09-24 15:37 ` Yann E. MORIN
2022-09-24 21:00 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2023-10-10 14:34 Thomas Devoogdt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox