[Mesa-dev] [PATCH] wayland-egl: redistribute wayland.egl.h include

[Emil Velikov]

On 3 October 2017 at 12:45, Andres Gomez <agomez at igalia.com> wrote:
> On Tue, 2017-10-03 at 01:49 +0200, Tobias Klausmann wrote:
>> Starting with commit ab0589c6ed ("wayland-egl: remove no longer needed
>> wayland-client dependency") the wayland-egl.h include was missing leading to a
>> build failure:
>>
>>   CC       wayland-egl.lo
>> wayland-egl.c:33:10: fatal error: wayland-egl.h: Datei oder Verzeichnis nicht
>> gefunden
>
> It would be good to have the error message in English in the commit
> log.
>
>>  #include "wayland-egl.h"
>>           ^~~~~~~~~~~~~~~
>>
>> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
>> Fixes: ab0589c6ed ("swayland-egl: remove no longer needed wayland-client
>
> wayland-egl ---------^
>
>> dependency")
>> ---
>>  src/egl/wayland/wayland-egl/Makefile.am | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
>> index 08a6768049..730fd03ddb 100644
>> --- a/src/egl/wayland/wayland-egl/Makefile.am
>> +++ b/src/egl/wayland/wayland-egl/Makefile.am
>> @@ -2,7 +2,8 @@ pkgconfigdir = $(libdir)/pkgconfig
>>  pkgconfig_DATA = wayland-egl.pc
>>
>>  AM_CFLAGS = $(DEFINES) \
>> -         $(VISIBILITY_CFLAGS)
>> +         $(VISIBILITY_CFLAGS) \
>> +         $(WAYLAND_SERVER_CFLAGS)
>>
>>  lib_LTLIBRARIES = libwayland-egl.la
>>  noinst_HEADERS = wayland-egl-backend.h
>
> This doesn't seem the proper thing to do after removing the wayland-
> client dep and forward declaring the struct wl_surface.
>
> I think we should just remove the "wayland-egl.h" include and also
> forward declare the 4 functions:
>  * wl_egl_window_resize
>  * wl_egl_window_create
>  * wl_egl_window_destroy
>  * wl_egl_window_get_attached_size
>
> Otherwise, forward declaring the struct wl_surface is not needed
> either.
>
> Let's see what Emil thinks although this is a bit urgent right now
> since the built is broken ...
>
That's the thing - the current wayland-egl split is somewhat bonkers.

I've addressed some nitpicks and am planning to lift the
implementation to the Wayland repository.
Where it should have been since day one, imho.

Still need to see when the Wayland people can do a release, so we can
eventually drop out copy.

In the meanwhile this will do. With Andres' suggestions:
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

-Emil