package/mesa-demo: remove duplicate osmesa option

Message ID 20180212215931.6105-1-audrey.motheron@gmail.com
State Accepted
Headers show
Series
  • package/mesa-demo: remove duplicate osmesa option
Related show

Commit Message

Audrey Motheron Feb. 12, 2018, 9:59 p.m.
--disable-osmesa option is unconditionally added to CONF_OPTS
even if --enable-osmesa is used latter.

Signed-off-by: Audrey Motheron <audrey.motheron@gmail.com>
---
 package/mesa3d-demos/mesa3d-demos.mk | 1 -
 1 file changed, 1 deletion(-)

Comments

Adrian Perez de Castro Feb. 12, 2018, 11:51 p.m. | #1
Hello,

Thanks for the patch, indeed the option was being duplicated! Just one small
comment: usually the commit summary line has only the package name, without
the “package/” prefix, and in this case the package name is “mesa-demos”,
so the first line of the commit message should be.

On Mon, 12 Feb 2018 22:59:31 +0100, Audrey Motheron <audrey.motheron@gmail.com> wrote:
> --disable-osmesa option is unconditionally added to CONF_OPTS
> even if --enable-osmesa is used latter.
> 
> Signed-off-by: Audrey Motheron <audrey.motheron@gmail.com>
> ---
>  package/mesa3d-demos/mesa3d-demos.mk | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
> index cbc15c3b69..9182803748 100644
> --- a/package/mesa3d-demos/mesa3d-demos.mk
> +++ b/package/mesa3d-demos/mesa3d-demos.mk
> @@ -12,7 +12,6 @@ MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
>  MESA3D_DEMOS_LICENSE = MIT
>  
>  MESA3D_DEMOS_CONF_OPTS += \
> -	--disable-osmesa \
>  	--disable-gles1
>  
>  ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
> -- 
> 2.14.3

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


--
 Adrián 🎩
Thomas Petazzoni Feb. 13, 2018, 9:55 p.m. | #2
Hello,

On Mon, 12 Feb 2018 23:51:12 +0000, Adrian Perez de Castro wrote:
> Hello,
> 
> Thanks for the patch, indeed the option was being duplicated! Just one small
> comment: usually the commit summary line has only the package name, without
> the “package/” prefix, and in this case the package name is “mesa-demos”,

Actually the package name is mesa3d-demos :-)

Thomas
Thomas Petazzoni Feb. 13, 2018, 9:55 p.m. | #3
Hello,

On Mon, 12 Feb 2018 22:59:31 +0100, Audrey Motheron wrote:
> --disable-osmesa option is unconditionally added to CONF_OPTS
> even if --enable-osmesa is used latter.
> 
> Signed-off-by: Audrey Motheron <audrey.motheron@gmail.com>
> ---
>  package/mesa3d-demos/mesa3d-demos.mk | 1 -
>  1 file changed, 1 deletion(-)

As Adrian said, the commit title should match the package name:
mesa3d-demos. I've fixed that up and applied to master. Thanks!

Thomas

Patch

diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index cbc15c3b69..9182803748 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -12,7 +12,6 @@  MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
 MESA3D_DEMOS_CONF_OPTS += \
-	--disable-osmesa \
 	--disable-gles1
 
 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)