Re: [Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
On Monday, 2018-11-19 16:15:24 +0100, Juan A. Suarez Romero wrote:
> On Thu, 2018-10-11 at 16:36 +0100, Eric Engestrom wrote:
> > Those empty variables in the !wayland case are useless and running that
> > meson.build with them breaks the build:
> >
> > [287/850] Generating wayland-drm-client-protocol.h with a custom command.
> > FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> > client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml
> > src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> > /bin/sh: client-header: command not found
> > ninja: build stopped: subcommand failed.
> >
> > Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
> > Signed-off-by: Eric Engestrom
> > ---
> > Kind of amazed that no one has tried to build with wayland disabled
> > since meson was introduced, but I guess it's a good thing ^^'
>
> Hi.
>
>
> This patch has been selected for next 18.2 release.
>
> Nevertheless, a trivial conflict was resolved when applying on the stable
> branch.
>
> You can find the fixed commit at
>
> https://gitlab.freedesktop.org/mesa/mesa/commit/865a97472a10aeb126f69e29a9459e2bc9922f70
Looks all good to me, thanks!
>
>
> J.A.
>
> > ---
> > meson.build | 7 ---
> > src/meson.build | 4 +++-
> > 2 files changed, 3 insertions(+), 8 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 0276b11e9cf003f6ebde..fcde41387ac2581ccad0 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1315,13 +1315,6 @@ if with_platform_wayland
> > 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
> >)
> >pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
> > -else
> > - prog_wl_scanner = []
> > - wl_scanner_arg = ''
> > - dep_wl_protocols = null_dep
> > - dep_wayland_client = null_dep
> > - dep_wayland_server = null_dep
> > - wayland_dmabuf_xml = ''
> > endif
> >
> > dep_x11 = null_dep
> > diff --git a/src/meson.build b/src/meson.build
> > index 2b8fcc36be5b0b1688ec..75f642018f03ecfef562 100644
> > --- a/src/meson.build
> > +++ b/src/meson.build
> > @@ -56,7 +56,9 @@ if with_gles1 or with_gles2 or with_shared_glapi
> > endif
> > # TODO: opengl
> > subdir('compiler')
> > -subdir('egl/wayland/wayland-drm')
> > +if with_platform_wayland
> > + subdir('egl/wayland/wayland-drm')
> > +endif
> > if with_any_vk
> >subdir('vulkan')
> > endif
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
On Thu, 2018-10-11 at 16:36 +0100, Eric Engestrom wrote:
> Those empty variables in the !wayland case are useless and running that
> meson.build with them breaks the build:
>
> [287/850] Generating wayland-drm-client-protocol.h with a custom command.
> FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml
> src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> /bin/sh: client-header: command not found
> ninja: build stopped: subcommand failed.
>
> Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
> Signed-off-by: Eric Engestrom
> ---
> Kind of amazed that no one has tried to build with wayland disabled
> since meson was introduced, but I guess it's a good thing ^^'
Hi.
This patch has been selected for next 18.2 release.
Nevertheless, a trivial conflict was resolved when applying on the stable
branch.
You can find the fixed commit at
https://gitlab.freedesktop.org/mesa/mesa/commit/865a97472a10aeb126f69e29a9459e2bc9922f70
J.A.
> ---
> meson.build | 7 ---
> src/meson.build | 4 +++-
> 2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 0276b11e9cf003f6ebde..fcde41387ac2581ccad0 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1315,13 +1315,6 @@ if with_platform_wayland
> 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
>)
>pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
> -else
> - prog_wl_scanner = []
> - wl_scanner_arg = ''
> - dep_wl_protocols = null_dep
> - dep_wayland_client = null_dep
> - dep_wayland_server = null_dep
> - wayland_dmabuf_xml = ''
> endif
>
> dep_x11 = null_dep
> diff --git a/src/meson.build b/src/meson.build
> index 2b8fcc36be5b0b1688ec..75f642018f03ecfef562 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -56,7 +56,9 @@ if with_gles1 or with_gles2 or with_shared_glapi
> endif
> # TODO: opengl
> subdir('compiler')
> -subdir('egl/wayland/wayland-drm')
> +if with_platform_wayland
> + subdir('egl/wayland/wayland-drm')
> +endif
> if with_any_vk
>subdir('vulkan')
> endif
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
Quoting Eric Engestrom (2018-11-11 10:39:16) > On Thursday, 2018-10-11 16:36:15 +0100, Eric Engestrom wrote: > > Those empty variables in the !wayland case are useless and running that > > meson.build with them breaks the build: > > > > [287/850] Generating wayland-drm-client-protocol.h with a custom command. > > FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h > > client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml > > src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h > > /bin/sh: client-header: command not found > > ninja: build stopped: subcommand failed. > > > > Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver" > > Signed-off-by: Eric Engestrom > > --- > > Kind of amazed that no one has tried to build with wayland disabled > > since meson was introduced, but I guess it's a good thing ^^' > > Humble ping for this series? > It is currently impossible to build Mesa without support for wayland, > which I think is quite an important bug :) > for the series: Reviewed-by: Dylan Baker signature.asc Description: signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
On Sun, 11 Nov 2018 at 18:39, Eric Engestrom wrote: > > On Thursday, 2018-10-11 16:36:15 +0100, Eric Engestrom wrote: > > Those empty variables in the !wayland case are useless and running that > > meson.build with them breaks the build: > > > > [287/850] Generating wayland-drm-client-protocol.h with a custom command. > > FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h > > client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml > > src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h > > /bin/sh: client-header: command not found > > ninja: build stopped: subcommand failed. > > > > Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver" > > Signed-off-by: Eric Engestrom > > --- > > Kind of amazed that no one has tried to build with wayland disabled > > since meson was introduced, but I guess it's a good thing ^^' > > Humble ping for this series? > It is currently impossible to build Mesa without support for wayland, > which I think is quite an important bug :) > I've always wondered if/how null_dep works. The series looks good IMHO, for the lot. Reviewed-by: Emil Velikov May be worth double-checking with Dylan. HTH Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
On Thursday, 2018-10-11 16:36:15 +0100, Eric Engestrom wrote:
> Those empty variables in the !wayland case are useless and running that
> meson.build with them breaks the build:
>
> [287/850] Generating wayland-drm-client-protocol.h with a custom command.
> FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml
> src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
> /bin/sh: client-header: command not found
> ninja: build stopped: subcommand failed.
>
> Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
> Signed-off-by: Eric Engestrom
> ---
> Kind of amazed that no one has tried to build with wayland disabled
> since meson was introduced, but I guess it's a good thing ^^'
Humble ping for this series?
It is currently impossible to build Mesa without support for wayland,
which I think is quite an important bug :)
> ---
> meson.build | 7 ---
> src/meson.build | 4 +++-
> 2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 0276b11e9cf003f6ebde..fcde41387ac2581ccad0 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1315,13 +1315,6 @@ if with_platform_wayland
> 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
>)
>pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
> -else
> - prog_wl_scanner = []
> - wl_scanner_arg = ''
> - dep_wl_protocols = null_dep
> - dep_wayland_client = null_dep
> - dep_wayland_server = null_dep
> - wayland_dmabuf_xml = ''
> endif
>
> dep_x11 = null_dep
> diff --git a/src/meson.build b/src/meson.build
> index 2b8fcc36be5b0b1688ec..75f642018f03ecfef562 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -56,7 +56,9 @@ if with_gles1 or with_gles2 or with_shared_glapi
> endif
> # TODO: opengl
> subdir('compiler')
> -subdir('egl/wayland/wayland-drm')
> +if with_platform_wayland
> + subdir('egl/wayland/wayland-drm')
> +endif
> if with_any_vk
>subdir('vulkan')
> endif
> --
> Cheers,
> Eric
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds
Those empty variables in the !wayland case are useless and running that
meson.build with them breaks the build:
[287/850] Generating wayland-drm-client-protocol.h with a custom command.
FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml
src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
/bin/sh: client-header: command not found
ninja: build stopped: subcommand failed.
Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom
---
Kind of amazed that no one has tried to build with wayland disabled
since meson was introduced, but I guess it's a good thing ^^'
---
meson.build | 7 ---
src/meson.build | 4 +++-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index 0276b11e9cf003f6ebde..fcde41387ac2581ccad0 100644
--- a/meson.build
+++ b/meson.build
@@ -1315,13 +1315,6 @@ if with_platform_wayland
'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
)
pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
-else
- prog_wl_scanner = []
- wl_scanner_arg = ''
- dep_wl_protocols = null_dep
- dep_wayland_client = null_dep
- dep_wayland_server = null_dep
- wayland_dmabuf_xml = ''
endif
dep_x11 = null_dep
diff --git a/src/meson.build b/src/meson.build
index 2b8fcc36be5b0b1688ec..75f642018f03ecfef562 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -56,7 +56,9 @@ if with_gles1 or with_gles2 or with_shared_glapi
endif
# TODO: opengl
subdir('compiler')
-subdir('egl/wayland/wayland-drm')
+if with_platform_wayland
+ subdir('egl/wayland/wayland-drm')
+endif
if with_any_vk
subdir('vulkan')
endif
--
Cheers,
Eric
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
