[Mesa-dev] [PATCH 3/5] meson: move gl pkgconfig generation out ofglx

[Marc Dietrich]

Hi Dylan,

Am Freitag, 3. November 2017, 01:06:27 CET schrieb Dylan Baker:
> Because the same generation logic is required by xlib glx and
> gallium-xlib glx, it makes sense to pull it out.
> 
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  src/glx/meson.build | 11 -----------
>  src/meson.build     | 12 ++++++++++++
>  2 files changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index 573316c9424..98e3ad561b3 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -167,17 +167,6 @@ if with_glx == 'dri'
>      version : gl_lib_version,
>      install : true,
>    )
> -
> -  pkg.generate(
> -    name : 'gl',
> -    filebase : 'gl',
> -    description : 'Mesa OpenGL Library',
> -    version : meson.project_version(),
> -    libraries : libgl,
> -    libraries_private : gl_priv_libs,
> -    requires_private : gl_priv_reqs,
> -    variables : ['glx_tls=yes'],
> -  )
>  endif
> 
>  if with_tests
> diff --git a/src/meson.build b/src/meson.build
> index 186cf92f47e..dd504cf3127 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -43,6 +43,18 @@ sha1_h = custom_target(
>    build_always : true, # commit sha1 can change without having touched
> these files )
> 
> +if with_glx != 'disabled'
> +  pkg.generate(
> +    name : 'gl',
> +    description : 'Mesa OpenGL Library',
> +    version : meson.project_version(),
> +    libraries : libgl,
> +    libraries_private : gl_priv_libs,
> +    requires_private : gl_priv_reqs,
> +    variables : ['glx_tls=yes'],
> +  )
> +endif
> +

mmh, this breaks here with 

Meson encountered an error in file src/meson.build, line 47, column 6:
Unknown variable "libgl".

configured with:

meson \
    --prefix=/usr \
    -Dgallium-drivers=r600,swrast \
    -Dvulkan-drivers= \
    -Dtexture-float=true \
    -Dgles1=true -Dgles2=true \
    -Dgallium-media=omx,va,vdpau,xvmc \
    -Dglvnd=true \
    -Ddri-drivers= \
    -Dosmesa=gallium \



Marc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171103/127ca96c/attachment-0001.sig>