package/mesa3d: rename OSMesa option

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>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/Config.in.legacy b/Config.in.legacy
index 61162e66e3ef4c100e6cba23b5150171702a7181..3fd92ade21ebc91ac7a124b7cec4b6e2e02bfcf8 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ 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.
+
 config BR2_PACKAGE_HOSTAPD_DRIVER_RTW
        bool "hostapd rtl871xdrv driver removed"
        select BR2_LEGACY

diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index ddff9b9ed99fbade2f5f21606574843c2aa95f79..e9aa44dc2e338824e0bb8de3cece3edb51418b71 100644 (file)
--- 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 70067058e6217753642a2a286d7728faf1a1c08e..13739f54c5d61d1b021e703baa9f00f14730bc98 100644 (file)
--- 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 b1799067ee9df3a1b56f4b66171a74abb37bb6b4..81736c83d360796e74099f2701c42b1c8936bd09 100644 (file)
--- 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 5cc1ba0566a8a1ddbbde483ab94d9e70275ba4c2..623db47c6e0a58d867ef5b765e49d762db23d207 100644 (file)
--- 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