Re: [Mesa-dev] [PATCH] meson: fix building without GL

[Dylan Baker]

Quoting Emil Velikov (2018-02-26 09:11:35)
> On 26 February 2018 at 16:46, Dylan Baker  wrote:
> > libgl will be undefined if with_glx == 'disabled', so move that check
> > inside the `if with_glx == 'disabled'` block immediately after that
> > check.
> >
> There's some of repetition, making this hard to read. Perhaps:
> 
> "libgl will be undefined glx is disabled, so move that just after the
> with_glx != 'disabled' check"
> 
> Either way
> Reviewed-by: Emil Velikov 
> 
> -Emil

Done, thanks Emil.


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] meson: fix building without GL

[Dylan Baker]

Quoting Eric Engestrom (2018-02-26 09:13:47)
> On Monday, 2018-02-26 16:56:46 +, Eric Engestrom wrote:
> > On Monday, 2018-02-26 08:46:54 -0800, Dylan Baker wrote:
> > > libgl will be undefined if with_glx == 'disabled', so move that check
> > > inside the `if with_glx == 'disabled'` block immediately after that
> > typo: s/==/!=/^^
> > 
> > Acked-by: Eric Engestrom 
> > 
> > > check.
> 
> actually, that sentence looks off; I suggest dropping the words after "block" 
> :)
> 

Done


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] meson: fix building without GL

[Eric Engestrom]

On Monday, 2018-02-26 16:56:46 +, Eric Engestrom wrote:
> On Monday, 2018-02-26 08:46:54 -0800, Dylan Baker wrote:
> > libgl will be undefined if with_glx == 'disabled', so move that check
> > inside the `if with_glx == 'disabled'` block immediately after that
> typo: s/==/!=/^^
> 
> Acked-by: Eric Engestrom 
> 
> > check.

actually, that sentence looks off; I suggest dropping the words after "block" :)

> > 
> > Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd")
> > Reported-by: Jason Ekstrand 
> > Signed-off-by: Dylan Baker 
> > CC: Daniel Stone 
> > CC: Jason Ekstrand 
> > ---
> >  src/meson.build | 19 ++-
> >  1 file changed, 10 insertions(+), 9 deletions(-)
> > 
> > diff --git a/src/meson.build b/src/meson.build
> > index b2c045fce10..19005271d73 100644
> > --- a/src/meson.build
> > +++ b/src/meson.build
> > @@ -82,18 +82,19 @@ if with_gallium
> >subdir('gallium')
> >  endif
> >  
> > -# If using glvnd the pkg-config header should not point to GL_mesa, it 
> > should
> > -# point to GL. glvnd is only available on unix like platforms so adding -l
> > -# should be safe here
> > -# TODO: in the glvnd case glvnd itself should really be providing this.
> > -if with_glvnd
> > -  _gl = '-L${libdir} -lGL'
> > -else
> > -  _gl = libgl
> > -endif
> >  # This must be after at least mesa, glx, and gallium, since libgl will be
> >  # defined in one of those subdirs depending on the glx provider.
> >  if with_glx != 'disabled'
> > +  # If using glvnd the pkg-config header should not point to GL_mesa, it 
> > should
> > +  # point to GL. glvnd is only available on unix like platforms so adding 
> > -l
> > +  # should be safe here
> > +  # TODO: in the glvnd case glvnd itself should really be providing this.
> > +  if with_glvnd
> > +_gl = '-L${libdir} -lGL'
> > +  else
> > +_gl = libgl
> > +  endif
> > +
> >pkg.generate(
> >  name : 'gl',
> >  description : 'Mesa OpenGL Library',
> > -- 
> > 2.16.2
> > 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] meson: fix building without GL

[Emil Velikov]

On 26 February 2018 at 16:46, Dylan Baker  wrote:
> libgl will be undefined if with_glx == 'disabled', so move that check
> inside the `if with_glx == 'disabled'` block immediately after that
> check.
>
There's some of repetition, making this hard to read. Perhaps:

"libgl will be undefined glx is disabled, so move that just after the
with_glx != 'disabled' check"

Either way
Reviewed-by: Emil Velikov 

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] meson: fix building without GL

[Eric Engestrom]

On Monday, 2018-02-26 08:46:54 -0800, Dylan Baker wrote:
> libgl will be undefined if with_glx == 'disabled', so move that check
> inside the `if with_glx == 'disabled'` block immediately after that
typo: s/==/!=/^^

Acked-by: Eric Engestrom 

> check.
> 
> Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd")
> Reported-by: Jason Ekstrand 
> Signed-off-by: Dylan Baker 
> CC: Daniel Stone 
> CC: Jason Ekstrand 
> ---
>  src/meson.build | 19 ++-
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/src/meson.build b/src/meson.build
> index b2c045fce10..19005271d73 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -82,18 +82,19 @@ if with_gallium
>subdir('gallium')
>  endif
>  
> -# If using glvnd the pkg-config header should not point to GL_mesa, it should
> -# point to GL. glvnd is only available on unix like platforms so adding -l
> -# should be safe here
> -# TODO: in the glvnd case glvnd itself should really be providing this.
> -if with_glvnd
> -  _gl = '-L${libdir} -lGL'
> -else
> -  _gl = libgl
> -endif
>  # This must be after at least mesa, glx, and gallium, since libgl will be
>  # defined in one of those subdirs depending on the glx provider.
>  if with_glx != 'disabled'
> +  # If using glvnd the pkg-config header should not point to GL_mesa, it 
> should
> +  # point to GL. glvnd is only available on unix like platforms so adding -l
> +  # should be safe here
> +  # TODO: in the glvnd case glvnd itself should really be providing this.
> +  if with_glvnd
> +_gl = '-L${libdir} -lGL'
> +  else
> +_gl = libgl
> +  endif
> +
>pkg.generate(
>  name : 'gl',
>  description : 'Mesa OpenGL Library',
> -- 
> 2.16.2
> 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] meson: fix building without GL

[Jason Ekstrand]

Acked-by: Jason Ekstrand 
Untested-by: Jason Ekstrand 

On Mon, Feb 26, 2018 at 8:46 AM, Dylan Baker  wrote:

> libgl will be undefined if with_glx == 'disabled', so move that check
> inside the `if with_glx == 'disabled'` block immediately after that
> check.
>
> Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with
> glvnd")
> Reported-by: Jason Ekstrand 
> Signed-off-by: Dylan Baker 
> CC: Daniel Stone 
> CC: Jason Ekstrand 
> ---
>  src/meson.build | 19 ++-
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/src/meson.build b/src/meson.build
> index b2c045fce10..19005271d73 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -82,18 +82,19 @@ if with_gallium
>subdir('gallium')
>  endif
>
> -# If using glvnd the pkg-config header should not point to GL_mesa, it
> should
> -# point to GL. glvnd is only available on unix like platforms so adding -l
> -# should be safe here
> -# TODO: in the glvnd case glvnd itself should really be providing this.
> -if with_glvnd
> -  _gl = '-L${libdir} -lGL'
> -else
> -  _gl = libgl
> -endif
>  # This must be after at least mesa, glx, and gallium, since libgl will be
>  # defined in one of those subdirs depending on the glx provider.
>  if with_glx != 'disabled'
> +  # If using glvnd the pkg-config header should not point to GL_mesa, it
> should
> +  # point to GL. glvnd is only available on unix like platforms so adding
> -l
> +  # should be safe here
> +  # TODO: in the glvnd case glvnd itself should really be providing this.
> +  if with_glvnd
> +_gl = '-L${libdir} -lGL'
> +  else
> +_gl = libgl
> +  endif
> +
>pkg.generate(
>  name : 'gl',
>  description : 'Mesa OpenGL Library',
> --
> 2.16.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] meson: fix building without GL

[Dylan Baker]

libgl will be undefined if with_glx == 'disabled', so move that check
inside the `if with_glx == 'disabled'` block immediately after that
check.

Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd")
Reported-by: Jason Ekstrand 
Signed-off-by: Dylan Baker 
CC: Daniel Stone 
CC: Jason Ekstrand 
---
 src/meson.build | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index b2c045fce10..19005271d73 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -82,18 +82,19 @@ if with_gallium
   subdir('gallium')
 endif
 
-# If using glvnd the pkg-config header should not point to GL_mesa, it should
-# point to GL. glvnd is only available on unix like platforms so adding -l
-# should be safe here
-# TODO: in the glvnd case glvnd itself should really be providing this.
-if with_glvnd
-  _gl = '-L${libdir} -lGL'
-else
-  _gl = libgl
-endif
 # This must be after at least mesa, glx, and gallium, since libgl will be
 # defined in one of those subdirs depending on the glx provider.
 if with_glx != 'disabled'
+  # If using glvnd the pkg-config header should not point to GL_mesa, it should
+  # point to GL. glvnd is only available on unix like platforms so adding -l
+  # should be safe here
+  # TODO: in the glvnd case glvnd itself should really be providing this.
+  if with_glvnd
+_gl = '-L${libdir} -lGL'
+  else
+_gl = libgl
+  endif
+
   pkg.generate(
 name : 'gl',
 description : 'Mesa OpenGL Library',
-- 
2.16.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev