package/libegl: 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 libegl 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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 379402d154b0ea97235f5591a3e08ee0f413dd54..864c605110d3ebc583da724f236d1b7aae4a8c2f 100644 (file)
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -4,7 +4,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_LIBEGL
        select BR2_PACKAGE_HAS_LIBGLES
        select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
@@ -24,7 +24,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 
 if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
        default "gpu-viv-bin-mx6q"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 0737140a9b4c40c501946e465a4580f8da5d72c4..0e4765c228ed597ae8e2fa6675f833bee951a1bb 100644 (file)
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -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_LIBGLES
+       depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES
        help
          EGL/GLES sink
 

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 8f2b649fff1fb4913a060c9d5a7adfd3ded88b3e..54aca4b562afb08c25939315210cf30e8dbc4785 100644 (file)
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -92,7 +92,7 @@ depends on BR2_PACKAGE_MESA3D_DRIVER
 config BR2_PACKAGE_MESA3D_OPENGL_EGL
        bool "EGL"
        depends on BR2_PACKAGE_HAS_UDEV
-       select BR2_PACKAGE_HAS_OPENGL_EGL
+       select BR2_PACKAGE_HAS_LIBEGL
        help
          Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications
          similar to GLX, for X, and WGL, for Windows.
@@ -106,7 +106,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
 
 endmenu
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
        default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
 
 config BR2_PACKAGE_PROVIDES_LIBGLES

diff --git a/package/opengl/libegl/Config.in b/package/opengl/libegl/Config.in
index 2d81a20774ae4e529bb9fbe5a46545a1fce8c74c..8401bb22ed0ab123a0b237bb8c89462727098da0 100644 (file)
--- a/package/opengl/libegl/Config.in
+++ b/package/opengl/libegl/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_HAS_OPENGL_EGL
+config BR2_PACKAGE_HAS_LIBEGL
        bool
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        string

diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk
index 3311e50104f6d5f87bfcdc807dd5e8eb27782d76..2e399cef6a4957ca255a8e6645b766d17c5a18ff 100644 (file)
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 LIBEGL_SOURCE =
-LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL))
+LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LIBEGL))
 
-ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
 ifeq ($(LIBEGL_DEPENDENCIES),)
 $(error No libEGL implementation selected. Configuration error.)
 endif

diff --git a/package/qt/Config.in b/package/qt/Config.in
index d3f6a5a13b7dc108fd24abd23648257323dabac1..eed25c84dc6416df0b4bf54975642598fdfe9a67 100644 (file)
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -295,7 +295,7 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 config BR2_PACKAGE_QT_OPENGL_ES
        bool "OpenGL ES v2.x support"
        depends on BR2_PACKAGE_HAS_LIBGLES
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        help
          Enable the OpenGL ES v2.x support.
 

diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 437b1d2493d1c191fb31022e234ab7482926692c..5d5b7f60ee8294a1b5ed8da6fcf2e5afbd09a759 100644 (file)
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -137,11 +137,11 @@ 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_LIBEGL
        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_LIBGLES
+       depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES
 
 config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
        bool "print support module"

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 5e1516dd87f362e72f9d55acb250543960e9b5fe..4a6e805b81cd2b20c09b7e2ba5bf4d37ef016647 100644 (file)
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5DECLARATIVE
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5BASE_GUI
        select BR2_PACKAGE_QT5BASE_EGLFS
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        depends on BR2_PACKAGE_HAS_LIBGLES
        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
@@ -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_LIBGLES) && \
+       depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
                BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index a821b40fd4df5a21d65c36b547aad33122019136..2747af85b2963485fc9b00c4efb5e3d1bb9f2c87 100644 (file)
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5DECLARATIVE
        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        depends on BR2_PACKAGE_HAS_LIBGLES
        help
          Qt is a cross-platform application and UI framework for
@@ -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_LIBGLES) && \
+       depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
                BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index 765bdc110ccd914dba74e0bb850ee38998feb17e..c00491c12e2d60af60e413226820986c1f450726 100644 (file)
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5MULTIMEDIA
        bool "qt5multimedia"
        select BR2_PACKAGE_QT5BASE
        select BR2_PACKAGE_QT5DECLARATIVE
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        depends on BR2_PACKAGE_HAS_LIBGLES
        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
@@ -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_LIBGLES) && \
+       depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
                BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
index 1ffcc0d78ddcc9bb10f689b528889be8c02be71f..30c2e79182a7cdc61fdd058c4ccf868d4d1279a0 100644 (file)
--- a/package/qt5/qt5quick1/Config.in
+++ b/package/qt5/qt5quick1/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_QT5QUICK1
        select BR2_PACKAGE_QT5DECLARATIVE
        # 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_LIBEGL
        depends on BR2_PACKAGE_HAS_LIBGLES
        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        help
@@ -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_LIBGLES || \
+       depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES || \
                BR2_PREFER_STATIC_LIB

diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 355aef0ce0b28ce1017e5115a144e90806347172..c350a7440df75c8f6069abd2bce651dcb700f97c 100644 (file)
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
        select BR2_PACKAGE_QT5BASE_NETWORK
        select BR2_PACKAGE_QT5DECLARATIVE
        depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-       depends on BR2_PACKAGE_HAS_OPENGL_EGL
+       depends on BR2_PACKAGE_HAS_LIBEGL
        depends on BR2_PACKAGE_HAS_LIBGLES
        help
          Qt is a cross-platform application and UI framework for
@@ -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_LIBGLES) && \
+       depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
                BR2_PACKAGE_QT5_JSCORE_AVAILABLE

diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 68b535b7e642916a0c0e96952f10482aa4bad0b4..4a82c9da70c2d070e7d08f46514b5cc7eb39ffd3 100644 (file)
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_RPI_USERLAND
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       select BR2_PACKAGE_HAS_OPENGL_EGL
+       select BR2_PACKAGE_HAS_LIBEGL
        select BR2_PACKAGE_HAS_LIBGLES
        select BR2_PACKAGE_HAS_OPENVG
        select BR2_PACKAGE_HAS_OPENMAX
@@ -19,7 +19,7 @@ config BR2_PACKAGE_RPI_USERLAND
 
 if BR2_PACKAGE_RPI_USERLAND
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
        default "rpi-userland"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES

diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
index c47b6a3b76b486e71d0375fa586799f1d8e7a745..c95ebbb71b26e079f379c66e9eae4089a7af0025 100644 (file)
--- a/package/sunxi-mali/Config.in
+++ b/package/sunxi-mali/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SUNXI_MALI
        bool "sunxi-mali"
-       select BR2_PACKAGE_HAS_OPENGL_EGL
+       select BR2_PACKAGE_HAS_LIBEGL
        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.
@@ -18,7 +18,7 @@ config BR2_PACKAGE_SUNXI_MALI
 
 if BR2_PACKAGE_SUNXI_MALI
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
        default "sunxi-mali"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES

diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
index 2bdc972b7ef5fbd98c331dd3f8df9cf354338849..3e8648ee69c0f38aa7133f69310570de0354ba0a 100644 (file)
--- a/package/ti-gfx/Config.in
+++ b/package/ti-gfx/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TI_GFX
        bool "ti-gfx"
-       select BR2_PACKAGE_HAS_OPENGL_EGL
+       select BR2_PACKAGE_HAS_LIBEGL
        select BR2_PACKAGE_HAS_LIBGLES
        select BR2_PACKAGE_HAS_POWERVR
        depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
@@ -11,7 +11,7 @@ config BR2_PACKAGE_TI_GFX
 
 if BR2_PACKAGE_TI_GFX
 
-config BR2_PACKAGE_PROVIDES_OPENGL_EGL
+config BR2_PACKAGE_PROVIDES_LIBEGL
        default "ti-gfx"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index fcc6abf36e4a0e588fec63f5521266c6f785a06b..70faaab2f0de582d4be34028f474695ee9d4e145 100644 (file)
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -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_LIBGLES
+       depends on !BR2_PACKAGE_HAS_LIBEGL || !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_LIBGLES
+       depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES
        help
          XBMC is an award-winning free and open source (GPL) software
          media player and entertainment hub for digital media.