From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 01/20] package/libgles: rename the _HAS and _PROVIDES variables
Date: Fri, 04 Apr 2014 18:41:13 +0200 [thread overview]
Message-ID: <533EE0A9.40405@mind.be> (raw)
In-Reply-To: <7568529058fb1caf7ef8222cf0412749053d1fa1.1394482605.git.yann.morin.1998@free.fr>
On 10/03/14 21:27, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> 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>
It no longer applies as is (well, it applies but it is not
correct anymore; it misses the new mesa3d and xbmc). Instead,
the change should be done with:
git grep -l 'BR2_PACKAGE_\(HAS\|PROVIDES\)_OPENGL_ES' | xargs sed -i 's/BR2_PACKAGE_\(HAS\|PROVIDES\)_OPENGL_ES/BR2_PACKAGE_\1_LIBGLES/g'
Other than that it gets my ack.
Same for the next 4 patches: use the automated change
and it gets my ack.
Please apply soonish to avoid further changes.
Regards,
Arnout
> ---
> package/cairo/cairo.mk | 2 +-
> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 4 ++--
> package/gstreamer1/gst1-plugins-bad/Config.in | 2 +-
> package/opengl/libgles/Config.in | 6 +++---
> package/opengl/libgles/libgles.mk | 4 ++--
> package/qt/Config.in | 2 +-
> package/qt5/qt5base/Config.in | 4 ++--
> package/qt5/qt5declarative/Config.in | 4 ++--
> package/qt5/qt5graphicaleffects/Config.in | 4 ++--
> package/qt5/qt5multimedia/Config.in | 4 ++--
> package/qt5/qt5quick1/Config.in | 4 ++--
> package/qt5/qt5quickcontrols/Config.in | 4 ++--
> package/rpi-userland/Config.in | 4 ++--
> package/sunxi-mali/Config.in | 4 ++--
> package/ti-gfx/Config.in | 4 ++--
> 15 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
> index aa03a27..ee58aff 100644
> --- a/package/cairo/cairo.mk
> +++ b/package/cairo/cairo.mk
> @@ -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
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> index e084568..379402d 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> @@ -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
> diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
> index 2c5c290..25e379f 100644
> --- 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_OPENGL_ES
> + depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_LIBGLES
> help
> EGL/GLES sink
>
> diff --git a/package/opengl/libgles/Config.in b/package/opengl/libgles/Config.in
> index 75ccfc8..b7b800f 100644
> --- a/package/opengl/libgles/Config.in
> +++ b/package/opengl/libgles/Config.in
> @@ -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
> diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
> index 7a07e37..041e378 100644
> --- a/package/opengl/libgles/libgles.mk
> +++ b/package/opengl/libgles/libgles.mk
> @@ -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
> diff --git a/package/qt/Config.in b/package/qt/Config.in
> index 5105e5d..d3f6a5a 100644
> --- a/package/qt/Config.in
> +++ b/package/qt/Config.in
> @@ -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.
> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> index 5c404d1..437b1d2 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -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"
> diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
> index c5753b1..5e1516d 100644
> --- a/package/qt5/qt5declarative/Config.in
> +++ b/package/qt5/qt5declarative/Config.in
> @@ -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
> diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
> index f4029e9..a821b40 100644
> --- a/package/qt5/qt5graphicaleffects/Config.in
> +++ b/package/qt5/qt5graphicaleffects/Config.in
> @@ -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
> diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
> index 53b7f86..765bdc1 100644
> --- a/package/qt5/qt5multimedia/Config.in
> +++ b/package/qt5/qt5multimedia/Config.in
> @@ -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
> diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in
> index 1a0b8bf..1ffcc0d 100644
> --- a/package/qt5/qt5quick1/Config.in
> +++ b/package/qt5/qt5quick1/Config.in
> @@ -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
> diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
> index e72f2a4..355aef0 100644
> --- a/package/qt5/qt5quickcontrols/Config.in
> +++ b/package/qt5/qt5quickcontrols/Config.in
> @@ -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
> diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
> index 2303942..68b535b 100644
> --- a/package/rpi-userland/Config.in
> +++ b/package/rpi-userland/Config.in
> @@ -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
> diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
> index 9f188a3..c47b6a3 100644
> --- a/package/sunxi-mali/Config.in
> +++ b/package/sunxi-mali/Config.in
> @@ -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
> diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
> index f455f4c..2bdc972 100644
> --- a/package/ti-gfx/Config.in
> +++ b/package/ti-gfx/Config.in
> @@ -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
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
next prev parent reply other threads:[~2014-04-04 16:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 20:27 [Buildroot] [PATCH 0/20 v4] Add new virtual-package infrastructure (branch yem/virtual-packages) Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 01/20] package/libgles: rename the _HAS and _PROVIDES variables Yann E. MORIN
2014-04-04 16:41 ` Arnout Vandecappelle [this message]
2014-04-04 20:23 ` Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 02/20] package/libegl: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 03/20] package/libopenmax: " Yann E. MORIN
2014-04-04 16:41 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 04/20] package/libopenvg: " Yann E. MORIN
2014-04-04 16:43 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 05/20] package/luainterpreter: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 06/20] package/lua: rename config options Yann E. MORIN
2014-04-04 16:48 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 07/20] manual: add virtual package tutorial Yann E. MORIN
2014-04-04 16:54 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 08/20] packages: add infrastructure for virtual packages Yann E. MORIN
2014-04-04 20:10 ` Arnout Vandecappelle
2014-04-05 14:41 ` Yann E. MORIN
2014-04-06 9:01 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 09/20] manual: update the virtual package section with the new infrastructure Yann E. MORIN
2014-03-12 11:59 ` Eric Le Bihan
2014-04-04 20:18 ` Arnout Vandecappelle
2014-03-10 20:27 ` [Buildroot] [PATCH 10/20] package/powervr: convert to the virtual-package infrastructure Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 11/20] package/libgles: " Yann E. MORIN
2014-03-12 12:15 ` Eric Le Bihan
2014-03-10 20:27 ` [Buildroot] [PATCH 12/20] package/libegl: " Yann E. MORIN
2014-03-12 12:18 ` Eric Le Bihan
2014-03-10 20:27 ` [Buildroot] [PATCH 13/20] package/libopenmax: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 14/20] package/libopenvg: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 15/20] package/luainterpreter: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 16/20] package/jpeg: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 17/20] package/cryptodev: " Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 18/20] package/udev: " Yann E. MORIN
2014-03-12 12:20 ` Eric Le Bihan
2014-03-10 20:27 ` [Buildroot] [PATCH 19/20] virtual-package: fake a version string for virtual packages Yann E. MORIN
2014-03-10 20:27 ` [Buildroot] [PATCH 20/20] FOO: tentative target and host virt packages Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=533EE0A9.40405@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.