[PATCH/next,v9,02/12] package/mesa3d: rename OSMesa option
diff mbox series

Message ID 20190811131755.30840-2-bernd.kuhls@t-online.de
State New
Headers show
Series
  • [PATCH/next,v9,01/12] package/python3-mako: new package
Related show

Commit Message

Bernd Kuhls Aug. 11, 2019, 1:17 p.m. UTC
From: Romain Naour <romain.naour@smile.fr>

This option is renamed in order to match the naming used by the
meson buildsystem.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy                     | 10 ++++++++++
 package/mesa3d-demos/mesa3d-demos.mk |  2 +-
 package/mesa3d/Config.in             |  8 ++++----
 package/mesa3d/mesa3d.mk             |  2 +-
 package/wine/wine.mk                 |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

Comments

André Hentschel Aug. 13, 2019, 7:09 p.m. UTC | #1
Am 11.08.19 um 15:17 schrieb Bernd Kuhls:
> From: Romain Naour <romain.naour@smile.fr>
> 
> This option is renamed in order to match the naming used by the
> meson buildsystem.
> 
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  Config.in.legacy                     | 10 ++++++++++
>  package/mesa3d-demos/mesa3d-demos.mk |  2 +-
>  package/mesa3d/Config.in             |  8 ++++----
>  package/mesa3d/mesa3d.mk             |  2 +-
>  package/wine/wine.mk                 |  2 +-
>  5 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index de05b07c97..4b5a2ce41e 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -144,6 +144,16 @@ endif
>  
>  ###############################################################################
>  
> +comment "Legacy options removed in 2019.11"
> +
> +config BR2_PACKAGE_MESA3D_OSMESA
> +	bool "mesa OSMesa option renamed"
> +	select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
> +	select BR2_LEGACY
> +	help
> +	  The option was renamed in order to match the naming used
> +	  by the meson buildsystem.
> +
>  comment "Legacy options removed in 2019.08"
>  
>  config BR2_GCC_VERSION_6_X
> diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
> index ddff9b9ed9..e9aa44dc2e 100644
> --- a/package/mesa3d-demos/mesa3d-demos.mk
> +++ b/package/mesa3d-demos/mesa3d-demos.mk
> @@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
>  MESA3D_DEMOS_DEPENDENCIES += libfreeglut
>  MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr
>  # osmesa support depends on glut
> -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
> +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
>  MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
>  else
>  MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 3f44e94229..bd05116aca 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -265,11 +265,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >=
>  
>  comment "Off-screen Rendering"
>  
> -config BR2_PACKAGE_MESA3D_OSMESA
> -	bool "OSMesa library"
> +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
> +	bool "OSMesa (classic) library"
>  	help
> -	  The OSMesa API provides functions for making off-screen
> -	  renderings.
> +	  The OSMesa classic API provides functions for
> +	  making off-screen renderings.
>  
>  if BR2_PACKAGE_MESA3D_DRIVER
>  
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index b1799067ee..81736c83d3 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -156,7 +156,7 @@ endif
>  
>  # APIs
>  
> -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
> +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
>  MESA3D_CONF_OPTS += --enable-osmesa
>  else
>  MESA3D_CONF_OPTS += --disable-osmesa
> diff --git a/package/wine/wine.mk b/package/wine/wine.mk
> index 78fa860ecf..a09fcdff23 100644
> --- a/package/wine/wine.mk
> +++ b/package/wine/wine.mk
> @@ -195,7 +195,7 @@ else
>  WINE_CONF_OPTS += --without-ldap
>  endif
>  
> -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
> +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
>  WINE_CONF_OPTS += --with-osmesa
>  WINE_DEPENDENCIES += mesa3d
>  else
> 

Acked-by: André Hentschel <nerv@dawncrow.de>

Patch
diff mbox series

diff --git a/Config.in.legacy b/Config.in.legacy
index de05b07c97..4b5a2ce41e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,6 +144,16 @@  endif
 
 ###############################################################################
 
+comment "Legacy options removed in 2019.11"
+
+config BR2_PACKAGE_MESA3D_OSMESA
+	bool "mesa OSMesa option renamed"
+	select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
+	select BR2_LEGACY
+	help
+	  The option was renamed in order to match the naming used
+	  by the meson buildsystem.
+
 comment "Legacy options removed in 2019.08"
 
 config BR2_GCC_VERSION_6_X
diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index ddff9b9ed9..e9aa44dc2e 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -61,7 +61,7 @@  ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
 MESA3D_DEMOS_DEPENDENCIES += libfreeglut
 MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr
 # osmesa support depends on glut
-ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
 MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
 else
 MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 3f44e94229..bd05116aca 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -265,11 +265,11 @@  comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >=
 
 comment "Off-screen Rendering"
 
-config BR2_PACKAGE_MESA3D_OSMESA
-	bool "OSMesa library"
+config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
+	bool "OSMesa (classic) library"
 	help
-	  The OSMesa API provides functions for making off-screen
-	  renderings.
+	  The OSMesa classic API provides functions for
+	  making off-screen renderings.
 
 if BR2_PACKAGE_MESA3D_DRIVER
 
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index b1799067ee..81736c83d3 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -156,7 +156,7 @@  endif
 
 # APIs
 
-ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
 MESA3D_CONF_OPTS += --enable-osmesa
 else
 MESA3D_CONF_OPTS += --disable-osmesa
diff --git a/package/wine/wine.mk b/package/wine/wine.mk
index 78fa860ecf..a09fcdff23 100644
--- a/package/wine/wine.mk
+++ b/package/wine/wine.mk
@@ -195,7 +195,7 @@  else
 WINE_CONF_OPTS += --without-ldap
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
 WINE_CONF_OPTS += --with-osmesa
 WINE_DEPENDENCIES += mesa3d
 else