package/libgles: rename the _HAS and _PROVIDES variables
The basic rule for a package is to have its options named after the package name. There is no reason this should not also be the case for virtual packages. Besides, this will allow us to switch libgles to use the soon-to-be-introduced virtual-package infrastructure. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> Cc: Mike Zick <minimod@morethan.org> Cc: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Acked-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
e09c0444f7
commit
ec0de5d26b
@ -54,7 +54,7 @@ else
|
||||
CAIRO_CONF_OPT += --disable-directfb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y)
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
CAIRO_CONF_OPT += --enable-glesv2
|
||||
CAIRO_DEPENDENCIES += libgles
|
||||
else
|
||||
|
@ -5,7 +5,7 @@ comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"
|
||||
config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
|
||||
bool "gpu-viv-bin-mx6q"
|
||||
select BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
select BR2_PACKAGE_HAS_OPENGL_ES
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
|
||||
depends on BR2_arm # Only relevant for i.MX6
|
||||
@ -27,7 +27,7 @@ if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_EGL
|
||||
default "gpu-viv-bin-mx6q"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "gpu-viv-bin-mx6q"
|
||||
|
||||
config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES
|
||||
|
@ -464,7 +464,7 @@ comment "rsvg plugin needs a toolchain w/ C++, wchar, threads"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
|
||||
bool "eglgles"
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_LIBGLES
|
||||
help
|
||||
EGL/GLES sink
|
||||
|
||||
|
@ -99,7 +99,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
|
||||
config BR2_PACKAGE_MESA3D_OPENGL_ES
|
||||
bool "OpenGL ES"
|
||||
select BR2_PACKAGE_HAS_OPENGL_ES
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
help
|
||||
Use the Khronos OpenGL ES APIs. This is commonly used on embedded
|
||||
systems and represents a subset of the OpenGL API.
|
||||
@ -109,7 +109,7 @@ endmenu
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_EGL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES
|
||||
|
||||
endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_HAS_OPENGL_ES
|
||||
config BR2_PACKAGE_HAS_LIBGLES
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
string
|
||||
|
@ -5,9 +5,9 @@
|
||||
################################################################################
|
||||
|
||||
LIBGLES_SOURCE =
|
||||
LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES))
|
||||
LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LIBGLES))
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y)
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
ifeq ($(LIBGLES_DEPENDENCIES),)
|
||||
$(error No libGLES implementation selected. Configuration error.)
|
||||
endif
|
||||
|
@ -294,7 +294,7 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
|
||||
|
||||
config BR2_PACKAGE_QT_OPENGL_ES
|
||||
bool "OpenGL ES v2.x support"
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
help
|
||||
Enable the OpenGL ES v2.x support.
|
||||
|
@ -138,10 +138,10 @@ comment "X.org XCB backend available if X.org is enabled"
|
||||
config BR2_PACKAGE_QT5BASE_EGLFS
|
||||
bool "eglfs support"
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
comment "eglfs backend available if OpenGLES and EGL are enabled"
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
|
||||
bool "print support module"
|
||||
|
@ -5,7 +5,7 @@ config BR2_PACKAGE_QT5DECLARATIVE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
select BR2_PACKAGE_QT5BASE_EGLFS
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5DECLARATIVE
|
||||
http://qt-project.org
|
||||
|
||||
comment "qt5declarative requires an OpenGL-capable backend"
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES) && \
|
||||
BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
|
@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
|
||||
select BR2_PACKAGE_QT5DECLARATIVE
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
|
||||
http://qt-project.org
|
||||
|
||||
comment "qt5graphicaleffects requires an OpenGL-capable backend"
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES) && \
|
||||
BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
|
@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5MULTIMEDIA
|
||||
select BR2_PACKAGE_QT5BASE
|
||||
select BR2_PACKAGE_QT5DECLARATIVE
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5MULTIMEDIA
|
||||
http://qt-project.org
|
||||
|
||||
comment "qt5multimedia requires an OpenGL-capable backend"
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES) && \
|
||||
BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
|
@ -9,7 +9,7 @@ config BR2_PACKAGE_QT5QUICK1
|
||||
# This module does not support static linking
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
@ -21,5 +21,5 @@ config BR2_PACKAGE_QT5QUICK1
|
||||
|
||||
comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend"
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES || \
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES || \
|
||||
BR2_PREFER_STATIC_LIB
|
||||
|
@ -5,7 +5,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
|
||||
select BR2_PACKAGE_QT5DECLARATIVE
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
@ -15,5 +15,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
|
||||
http://qt-project.org
|
||||
|
||||
comment "qt5quickcontrols requires an OpenGL-capable backend"
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \
|
||||
depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES) && \
|
||||
BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
|
@ -5,7 +5,7 @@ config BR2_PACKAGE_RPI_USERLAND
|
||||
depends on BR2_LARGEFILE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
select BR2_PACKAGE_HAS_OPENGL_ES
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_HAS_OPENVG
|
||||
select BR2_PACKAGE_HAS_OPENMAX
|
||||
help
|
||||
@ -22,7 +22,7 @@ if BR2_PACKAGE_RPI_USERLAND
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_EGL
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENVG
|
||||
|
@ -1,7 +1,7 @@
|
||||
config BR2_PACKAGE_SUNXI_MALI
|
||||
bool "sunxi-mali"
|
||||
select BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
select BR2_PACKAGE_HAS_OPENGL_ES
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
# The egl/gles mali libraries are provided as a git submodule of the
|
||||
# sunxi-mali repo and are downloaded by the sunxi-mali-prop package.
|
||||
select BR2_PACKAGE_SUNXI_MALI_PROP
|
||||
@ -21,7 +21,7 @@ if BR2_PACKAGE_SUNXI_MALI
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_EGL
|
||||
default "sunxi-mali"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "sunxi-mali"
|
||||
|
||||
config BR2_PACKAGE_SUNXI_MALI_DBG
|
||||
|
@ -1,7 +1,7 @@
|
||||
config BR2_PACKAGE_TI_GFX
|
||||
bool "ti-gfx"
|
||||
select BR2_PACKAGE_HAS_OPENGL_EGL
|
||||
select BR2_PACKAGE_HAS_OPENGL_ES
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_HAS_POWERVR
|
||||
depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
|
||||
help
|
||||
@ -14,7 +14,7 @@ if BR2_PACKAGE_TI_GFX
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_EGL
|
||||
default "ti-gfx"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_OPENGL_ES
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "ti-gfx"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_POWERVR
|
||||
|
@ -2,7 +2,7 @@ comment "xbmc needs an (e)glibc toolchain w/ C++, threads"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "xbmc requires an OpenGL ES and EGL backend"
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
@ -59,7 +59,7 @@ menuconfig BR2_PACKAGE_XBMC
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES
|
||||
depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_LIBGLES
|
||||
help
|
||||
XBMC is an award-winning free and open source (GPL) software
|
||||
media player and entertainment hub for digital media.
|
||||
|
Loading…
Reference in New Issue
Block a user