[v3] package/wpebackend-fdo: package needs wayland libegl
diff mbox series

Message ID 20190415091632.6437-1-giulio.benetti@micronovasrl.com
State Accepted
Commit 5b3c7a3e7828107eaa9dad49ba2650466277d891
Headers show
Series
  • [v3] package/wpebackend-fdo: package needs wayland libegl
Related show

Commit Message

Giulio Benetti April 15, 2019, 9:16 a.m. UTC
Now wpebackend-fdo depends only on HAS_LIBEGL but if libegl is not of
wayland type, build breaks due to different EGLNativeWindowType types
depending on backends(fb,x11,wl).

Modify:
'depend on BR2_PACKAGE_HAS_LIBEGL'
to:
'depend on BR2_PACKAGE_HAS_LIBEGL_WAYLAND'
in Config.in to avoid building if there is not a wayland egl backend.
Modify also comment in Config.in when package is not selectable
mentioning the need to have an OpenEGL-capable Wayland backend.

Fixes:
http://autobuild.buildroot.net/results/4f02b91f6ffffd194e09ed18c917b4f678b1a52d/

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
Changes:
V1->V2:
* use BR2_PACKAGE_HAS_LIBEGL_WAYLAND only instead of using 
  BR2_PACKAGE_HAS_LIBEGL too
* add Wayland to comment

V2->V3:
* add `\` at the end of `depends on`

 package/wpebackend-fdo/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Adrian Perez de Castro April 30, 2019, 12:28 p.m. UTC | #1
Hi,

I finally got round to look at this; the changes make sense. I also did try
a couple of builds with the patch applied (which went fine). Thanks!

On Mon, 15 Apr 2019 11:16:32 +0200, Giulio Benetti <giulio.benetti@micronovasrl.com> wrote:

> Now wpebackend-fdo depends only on HAS_LIBEGL but if libegl is not of
> wayland type, build breaks due to different EGLNativeWindowType types
> depending on backends(fb,x11,wl).
> 
> Modify:
> 'depend on BR2_PACKAGE_HAS_LIBEGL'
> to:
> 'depend on BR2_PACKAGE_HAS_LIBEGL_WAYLAND'
> in Config.in to avoid building if there is not a wayland egl backend.
> Modify also comment in Config.in when package is not selectable
> mentioning the need to have an OpenEGL-capable Wayland backend.
> 
> Fixes:
> http://autobuild.buildroot.net/results/4f02b91f6ffffd194e09ed18c917b4f678b1a52d/
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>

Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>

> ---
> Changes:
> V1->V2:
> * use BR2_PACKAGE_HAS_LIBEGL_WAYLAND only instead of using 
>   BR2_PACKAGE_HAS_LIBEGL too
> * add Wayland to comment
> 
> V2->V3:
> * add `\` at the end of `depends on`
> 
>  package/wpebackend-fdo/Config.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in
> index 2f5f965403..161e4c9a7e 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 backend"
> -	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
> +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 \
>  		|| !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
> +	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>  	select BR2_PACKAGE_LIBGLIB2
>  	select BR2_PACKAGE_LIBWPE
>  	select BR2_PACKAGE_WAYLAND
> -- 
> 2.17.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Giulio Benetti April 30, 2019, 1:41 p.m. UTC | #2
Il 30/04/2019 14:28, Adrian Perez de Castro ha scritto:
> Hi,
> 
> I finally got round to look at this; the changes make sense. I also did try
> a couple of builds with the patch applied (which went fine). Thanks!

Thank you.
Best regards

Giulio

> On Mon, 15 Apr 2019 11:16:32 +0200, Giulio Benetti <giulio.benetti@micronovasrl.com> wrote:
> 
>> Now wpebackend-fdo depends only on HAS_LIBEGL but if libegl is not of
>> wayland type, build breaks due to different EGLNativeWindowType types
>> depending on backends(fb,x11,wl).
>>
>> Modify:
>> 'depend on BR2_PACKAGE_HAS_LIBEGL'
>> to:
>> 'depend on BR2_PACKAGE_HAS_LIBEGL_WAYLAND'
>> in Config.in to avoid building if there is not a wayland egl backend.
>> Modify also comment in Config.in when package is not selectable
>> mentioning the need to have an OpenEGL-capable Wayland backend.
>>
>> Fixes:
>> http://autobuild.buildroot.net/results/4f02b91f6ffffd194e09ed18c917b4f678b1a52d/
>>
>> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
> 
> Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
> 
>> ---
>> Changes:
>> V1->V2:
>> * use BR2_PACKAGE_HAS_LIBEGL_WAYLAND only instead of using
>>    BR2_PACKAGE_HAS_LIBEGL too
>> * add Wayland to comment
>>
>> V2->V3:
>> * add `\` at the end of `depends on`
>>
>>   package/wpebackend-fdo/Config.in | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in
>> index 2f5f965403..161e4c9a7e 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 backend"
>> -	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
>> +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 \
>>   		|| !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
>> +	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>>   	select BR2_PACKAGE_LIBGLIB2
>>   	select BR2_PACKAGE_LIBWPE
>>   	select BR2_PACKAGE_WAYLAND
>> -- 
>> 2.17.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot

Patch
diff mbox series

diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in
index 2f5f965403..161e4c9a7e 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 backend"
-	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
+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 \
 		|| !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
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBWPE
 	select BR2_PACKAGE_WAYLAND