jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/mesa3d: rename OSMesa option

Browse Source 
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>
This commit is contained in:
Romain Naour 2019-09-20 18:38:38 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent e8ffb58c6f
commit 4622153797
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2019.11" 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 config BR2_PACKAGE_HOSTAPD_DRIVER_RTW
bool "hostapd rtl871xdrv driver removed" bool "hostapd rtl871xdrv driver removed"
select BR2_LEGACY select BR2_LEGACY

2
package/mesa3d-demos/mesa3d-demos.mk
View File

@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_DEPENDENCIES += libfreeglut
MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr
# osmesa support depends on glut # osmesa support depends on glut
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
MESA3D_DEMOS_CONF_OPTS += --enable-osmesa MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
else else
MESA3D_DEMOS_CONF_OPTS += --disable-osmesa MESA3D_DEMOS_CONF_OPTS += --disable-osmesa

8
package/mesa3d/Config.in
View File

@ -265,11 +265,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >=
comment "Off-screen Rendering" comment "Off-screen Rendering"
config BR2_PACKAGE_MESA3D_OSMESA config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
bool "OSMesa library" bool "OSMesa (classic) library"
help help
The OSMesa API provides functions for making off-screen The OSMesa classic API provides functions for
renderings. making off-screen renderings.
if BR2_PACKAGE_MESA3D_DRIVER if BR2_PACKAGE_MESA3D_DRIVER

2
package/mesa3d/mesa3d.mk
View File

@ -156,7 +156,7 @@ endif
# APIs # APIs
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
MESA3D_CONF_OPTS += --enable-osmesa MESA3D_CONF_OPTS += --enable-osmesa
else else
MESA3D_CONF_OPTS += --disable-osmesa MESA3D_CONF_OPTS += --disable-osmesa

2
package/wine/wine.mk
View File

@ -195,7 +195,7 @@ else
WINE_CONF_OPTS += --without-ldap WINE_CONF_OPTS += --without-ldap
endif endif
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
WINE_CONF_OPTS += --with-osmesa WINE_CONF_OPTS += --with-osmesa
WINE_DEPENDENCIES += mesa3d WINE_DEPENDENCIES += mesa3d
else else