* [Buildroot] [PATCH 01/10] package/lua: rename config options
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 02/10] packages: add infrastructure for virtual packages Yann E. MORIN
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Package's options should be named after the package.
Lua is an interpreter, but the package is named 'lua'. So we want to
name the config option with '_LUA_', not with '_LUA_INTERPRETER_'
Besides, naming them with '_LUA_INTERPRETER_' might be confusing, since
there is a package named 'luainterpreter'.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
---
Config.in.legacy | 24 ++++++++++++++++++++++++
package/lua/Config.in | 10 +++++-----
package/lua/lua.mk | 4 ++--
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 4424e31..d100d34 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -99,6 +99,30 @@ comment "----------------------------------------------------"
endif
###############################################################################
+comment "Legacy options removed in 2014.05"
+
+config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+ bool "Lua command-line editing none has been renamed"
+ help
+ The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been
+ renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select
+ it in the corresponding choice.
+
+config BR2_PACKAGE_LUA_INTERPRETER_READLINE
+ bool "Lua command-line editing using readline has been renamed"
+ help
+ The BR2_PACKAGE_LUA_INTERPRETER_READLINE option has been
+ renamed to BR2_PACKAGE_LUA_READLINE. You will have to select
+ it in the corresponding choice.
+
+config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+ bool "Lua command-line editing using linenoise has been renamed"
+ help
+ The BR2_PACKAGE_LUA_INTERPRETER_LINENOISE option has been
+ renamed to BR2_PACKAGE_LUA_LINENOISE. You will have to select
+ it in the corresponding choice.
+
+###############################################################################
comment "Legacy options removed in 2014.02"
config BR2_sh2
diff --git a/package/lua/Config.in b/package/lua/Config.in
index c4c12e9..2afb7c5 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -30,22 +30,22 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
default "5.2" if BR2_PACKAGE_LUA_5_2
choice
- prompt "Lua Interpreter command-line editing"
- default BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+ prompt "Lua command-line editing"
+ default BR2_PACKAGE_LUA_EDITING_NONE
-config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+config BR2_PACKAGE_LUA_EDITING_NONE
bool "none"
help
None.
-config BR2_PACKAGE_LUA_INTERPRETER_READLINE
+config BR2_PACKAGE_LUA_READLINE
bool "readline support"
select BR2_PACKAGE_READLINE
select BR2_PACKAGE_NCURSES
help
Enables command-line editing in the Lua interpreter.
-config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+config BR2_PACKAGE_LUA_LINENOISE
bool "linenoise support"
select BR2_PACKAGE_LINENOISE
help
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 2c867f6..49107a6 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -24,12 +24,12 @@ LUA_CFLAGS += -D_FILE_OFFSET_BITS=32
endif
endif
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
+ifeq ($(BR2_PACKAGE_LUA_READLINE),y)
LUA_DEPENDENCIES = readline ncurses
LUA_MYLIBS += -lreadline -lhistory -lncurses
LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE
else
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
+ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y)
LUA_DEPENDENCIES = linenoise
LUA_MYLIBS += -llinenoise
LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_LINENOISE
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 02/10] packages: add infrastructure for virtual packages
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 01/10] package/lua: rename config options Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 03/10] package/powervr: convert to the virtual-package infrastructure Yann E. MORIN
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
The virtual-package infrastructure allows to easily define a
virtual package in a single line:
$ package/some-virtual-package/some-virtual-package.mk:
$(eval $(virtual-package))
And that's all. :-)
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>
---
package/Makefile.in | 1 +
package/pkg-virtual.mk | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
create mode 100644 package/pkg-virtual.mk
diff --git a/package/Makefile.in b/package/Makefile.in
index eea7043..ce4fcd9 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -360,4 +360,5 @@ include package/pkg-autotools.mk
include package/pkg-cmake.mk
include package/pkg-luarocks.mk
include package/pkg-python.mk
+include package/pkg-virtual.mk
include package/pkg-generic.mk
diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk
new file mode 100644
index 0000000..34a6807
--- /dev/null
+++ b/package/pkg-virtual.mk
@@ -0,0 +1,64 @@
+################################################################################
+# Virtual package infrastructure
+#
+# This file implements an infrastructure that eases development of
+# package .mk files for virtual packages. It should be used for all
+# virtual packages.
+#
+# See the Buildroot documentation for details on the usage of this
+# infrastructure
+#
+# In terms of implementation, this virtual infrastructure requires
+# the .mk file to only call the 'virtual-package' macro.
+#
+################################################################################
+
+
+################################################################################
+# inner-virtual-package -- defines the dependency rules of the virtual
+# package against its provider.
+#
+# argument 1 is the lowercase package name
+# argument 2 is the uppercase package name, including an HOST_ prefix
+# for host packages
+# argument 3 is the uppercase package name, without the HOST_ prefix
+# for host packages
+# argument 4 is the type (target or host)
+################################################################################
+
+# Note: putting this comment here rather than in the define block, otherwise
+# make would try to expand the $(error ...) in the comment, which is not
+# really what we want.
+# We need to use second-expansion for the $(error ...) call, below,
+# so it is not evaluated now, but as part of the generated make code.
+
+define inner-virtual-package
+
+# Ensure the virtual package has an implementation defined.
+ifeq ($(BR2_PACKAGE_HAS_$(2)),y)
+ifeq ($(call qstrip,$(BR2_PACKAGE_PROVIDES_$(2))),)
+$$(error No implementation selected for virtual package $(1). Configuration error)
+endif
+endif
+
+# A virtual package does not have any source associated
+$(2)_SOURCE =
+
+# This must be repeated from inner-generic-package, otherwise we get an empty
+# _DEPENDENCIES
+$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
+
+# Add dependency against the provider
+$(2)_DEPENDENCIES += $(call qstrip,$(BR2_PACKAGE_PROVIDES_$(2)))
+
+# Call the generic package infrastructure to generate the necessary
+# make targets
+$(call inner-generic-package,$(1),$(2),$(3),$(4))
+
+endef
+
+################################################################################
+# virtual-package -- the target generator macro for virtual packages
+################################################################################
+
+virtual-package = $(call inner-virtual-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 03/10] package/powervr: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 01/10] package/lua: rename config options Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 02/10] packages: add infrastructure for virtual packages Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 04/10] package/libgles: " Yann E. MORIN
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
package/powervr/powervr.mk | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/package/powervr/powervr.mk b/package/powervr/powervr.mk
index 1f43505..5a55860 100644
--- a/package/powervr/powervr.mk
+++ b/package/powervr/powervr.mk
@@ -4,14 +4,4 @@
#
################################################################################
-POWERVR_SOURCE =
-POWERVR_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_POWERVR))
-
-ifeq ($(POWERVR_DEPENDENCIES),)
-define POWERVR_CONFIGURE_CMDS
- echo "No PowerVR implementation selected. Configuration error."
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 04/10] package/libgles: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (2 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 03/10] package/powervr: convert to the virtual-package infrastructure Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 05/10] package/libegl: " Yann E. MORIN
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
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 | 12 +-----------
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, 27 insertions(+), 37 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 efad91e..92150cc 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -454,7 +454,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 0dcbaa7..407f8f9 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -4,14 +4,4 @@
#
################################################################################
-LIBGLES_SOURCE =
-LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES))
-
-ifeq ($(LIBGLES_DEPENDENCIES),)
-define LIBGLES_CONFIGURE_CMDS
- echo "No libGLES implementation selected. Configuration error."
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
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
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 05/10] package/libegl: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (3 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 04/10] package/libgles: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 06/10] package/libopenmax: " Yann E. MORIN
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 4 ++--
package/gstreamer1/gst1-plugins-bad/Config.in | 2 +-
package/opengl/libegl/Config.in | 6 +++---
package/opengl/libegl/libegl.mk | 12 +-----------
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 ++--
14 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 379402d..864c605 100644
--- 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 92150cc..0683006 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -454,7 +454,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/opengl/libegl/Config.in b/package/opengl/libegl/Config.in
index 2d81a20..8401bb2 100644
--- 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 b2b74f1..1f5460e 100644
--- a/package/opengl/libegl/libegl.mk
+++ b/package/opengl/libegl/libegl.mk
@@ -4,14 +4,4 @@
#
################################################################################
-LIBEGL_SOURCE =
-LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL))
-
-ifeq ($(LIBEGL_DEPENDENCIES),)
-define LIBEGL_CONFIGURE_CMDS
- echo "No libEGL implementation selected. Configuration error."
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
diff --git a/package/qt/Config.in b/package/qt/Config.in
index d3f6a5a..eed25c8 100644
--- 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 437b1d2..5d5b7f6 100644
--- 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 5e1516d..4a6e805 100644
--- 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 a821b40..2747af8 100644
--- 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 765bdc1..c00491c 100644
--- 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 1ffcc0d..30c2e79 100644
--- 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 355aef0..c350a74 100644
--- 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 68b535b..4a82c9d 100644
--- 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 c47b6a3..c95ebbb 100644
--- 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 2bdc972..3e8648e 100644
--- 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
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 06/10] package/libopenmax: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (4 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 05/10] package/libegl: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 07/10] package/libopenvg: " Yann E. MORIN
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
package/bellagio/Config.in | 4 ++--
package/gstreamer1/gst-omx/Config.in | 4 ++--
package/opengl/libopenmax/Config.in | 6 +++---
package/opengl/libopenmax/libopenmax.mk | 12 +-----------
package/rpi-userland/Config.in | 4 ++--
5 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/package/bellagio/Config.in b/package/bellagio/Config.in
index 2beb658..ee87e13 100644
--- a/package/bellagio/Config.in
+++ b/package/bellagio/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_BELLAGIO
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_PREFER_STATIC_LIB
- select BR2_PACKAGE_HAS_OPENMAX
+ select BR2_PACKAGE_HAS_LIBOPENMAX
help
Bellagio is an opensource implementation of the
OpenMAX IL API.
@@ -19,7 +19,7 @@ config BR2_PACKAGE_BELLAGIO
if BR2_PACKAGE_BELLAGIO
-config BR2_PACKAGE_PROVIDES_OPENMAX
+config BR2_PACKAGE_PROVIDES_LIBOPENMAX
default "bellagio"
endif
diff --git a/package/gstreamer1/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in
index 1d5b131..d2e4776 100644
--- a/package/gstreamer1/gst-omx/Config.in
+++ b/package/gstreamer1/gst-omx/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GST_OMX
bool "gst-omx"
- depends on BR2_PACKAGE_HAS_OPENMAX
+ depends on BR2_PACKAGE_HAS_LIBOPENMAX
select BR2_PACKAGE_GST1_PLUGINS_BASE
help
GStreamer plug-in to use OpenMAX API.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_GST_OMX
http://cgit.freedesktop.org/gstreamer/gst-omx
comment "gst-omx requires a OpenMAX implementation"
- depends on !BR2_PACKAGE_HAS_OPENMAX
+ depends on !BR2_PACKAGE_HAS_LIBOPENMAX
diff --git a/package/opengl/libopenmax/Config.in b/package/opengl/libopenmax/Config.in
index 105c53e..d50f2ce 100644
--- a/package/opengl/libopenmax/Config.in
+++ b/package/opengl/libopenmax/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_HAS_OPENMAX
+config BR2_PACKAGE_HAS_LIBOPENMAX
bool
-config BR2_PACKAGE_PROVIDES_OPENMAX
- depends on BR2_PACKAGE_HAS_OPENMAX
+config BR2_PACKAGE_PROVIDES_LIBOPENMAX
+ depends on BR2_PACKAGE_HAS_LIBOPENMAX
string
diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk
index c4f1f71..bc2e7f8 100644
--- a/package/opengl/libopenmax/libopenmax.mk
+++ b/package/opengl/libopenmax/libopenmax.mk
@@ -4,14 +4,4 @@
#
################################################################################
-LIBOPENMAX_SOURCE =
-LIBOPENMAX_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENMAX))
-
-ifeq ($(LIBOPENMAX_DEPENDENCIES),)
-define LIBOPENMAX_CONFIGURE_CMDS
- echo "No libopenmax implementation selected. Configuration error."
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 4a82c9d..68ac1f6 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_RPI_USERLAND
select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_HAS_OPENVG
- select BR2_PACKAGE_HAS_OPENMAX
+ select BR2_PACKAGE_HAS_LIBOPENMAX
help
Raspberry Pi Userland contains the necessary library to use the
VideoCore driver.
@@ -28,7 +28,7 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
config BR2_PACKAGE_PROVIDES_OPENVG
default "rpi-userland"
-config BR2_PACKAGE_PROVIDES_OPENMAX
+config BR2_PACKAGE_PROVIDES_LIBOPENMAX
default "rpi-userland"
endif
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 07/10] package/libopenvg: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (5 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 06/10] package/libopenmax: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 08/10] package/luainterpreter: " Yann E. MORIN
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
package/cairo/cairo.mk | 2 +-
package/opengl/libopenvg/Config.in | 6 +++---
package/opengl/libopenvg/libopenvg.mk | 12 +-----------
package/rpi-userland/Config.in | 4 ++--
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index ee58aff..43238ca 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -61,7 +61,7 @@ else
CAIRO_CONF_OPT += --disable-glesv2
endif
-ifeq ($(BR2_PACKAGE_HAS_OPENVG),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
CAIRO_CONF_OPT += --enable-vg
CAIRO_DEPENDENCIES += libopenvg
else
diff --git a/package/opengl/libopenvg/Config.in b/package/opengl/libopenvg/Config.in
index 9d31525..53cde6a 100644
--- a/package/opengl/libopenvg/Config.in
+++ b/package/opengl/libopenvg/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_HAS_OPENVG
+config BR2_PACKAGE_HAS_LIBOPENVG
bool
-config BR2_PACKAGE_PROVIDES_OPENVG
- depends on BR2_PACKAGE_HAS_OPENVG
+config BR2_PACKAGE_PROVIDES_LIBOPENVG
+ depends on BR2_PACKAGE_HAS_LIBOPENVG
string
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index ffd9d68..3ce85a1 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -4,14 +4,4 @@
#
################################################################################
-LIBOPENVG_SOURCE =
-LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG))
-
-ifeq ($(LIBOPENVG_DEPENDENCIES),)
-define LIBOPENVG_CONFIGURE_CMDS
- echo "No libOpenVG implementation selected. Configuration error."
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 68ac1f6..aeee5e1 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_RPI_USERLAND
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES
- select BR2_PACKAGE_HAS_OPENVG
+ select BR2_PACKAGE_HAS_LIBOPENVG
select BR2_PACKAGE_HAS_LIBOPENMAX
help
Raspberry Pi Userland contains the necessary library to use the
@@ -25,7 +25,7 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
config BR2_PACKAGE_PROVIDES_LIBGLES
default "rpi-userland"
-config BR2_PACKAGE_PROVIDES_OPENVG
+config BR2_PACKAGE_PROVIDES_LIBOPENVG
default "rpi-userland"
config BR2_PACKAGE_PROVIDES_LIBOPENMAX
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 08/10] package/luainterpreter: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (6 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 07/10] package/libopenvg: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 09/10] package/jpeg: " Yann E. MORIN
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
---
package/Config.in | 2 +-
package/lbase64/Config.in | 2 +-
package/lua-cjson/Config.in | 2 +-
package/lua-ev/Config.in | 2 +-
package/lua-msgpack-native/Config.in | 2 +-
package/lua/Config.in | 4 ++--
package/luaexpat/Config.in | 2 +-
package/luafilesystem/Config.in | 2 +-
package/luainterpreter/Config.in | 6 +++---
package/luainterpreter/luainterpreter.mk | 5 +----
package/luajit/Config.in | 4 ++--
package/luaposix/Config.in | 2 +-
package/luasec/Config.in | 2 +-
package/luasocket/Config.in | 2 +-
package/luasql-sqlite3/Config.in | 2 +-
package/rings/Config.in | 2 +-
16 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index fca61d6..3a23f29 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -362,7 +362,7 @@ source "package/jimtcl/Config.in"
source "package/lua/Config.in"
source "package/luainterpreter/Config.in"
source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUA_INTERPRETER
+if BR2_PACKAGE_HAS_LUAINTERPRETER
menu "Lua libraries/modules"
source "package/cgilua/Config.in"
source "package/copas/Config.in"
diff --git a/package/lbase64/Config.in b/package/lbase64/Config.in
index 4593ab9..48d3fdb 100644
--- a/package/lbase64/Config.in
+++ b/package/lbase64/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LBASE64
bool "lbase64"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help
A base64 library for Lua
diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in
index 8129fab..1f4c7c7 100644
--- a/package/lua-cjson/Config.in
+++ b/package/lua-cjson/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUA_CJSON
bool "lua-cjson"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
help
The Lua CJSON module provides JSON support for Lua. It features:
- Fast, standards compliant encoding/parsing routines
diff --git a/package/lua-ev/Config.in b/package/lua-ev/Config.in
index 28da114..74b5dc7 100644
--- a/package/lua-ev/Config.in
+++ b/package/lua-ev/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUA_EV
bool "lua-ev"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
select BR2_PACKAGE_LIBEV
depends on !(BR2_avr32 || BR2_bfin) # libev
help
diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in
index 498b30c..c7b3373 100644
--- a/package/lua-msgpack-native/Config.in
+++ b/package/lua-msgpack-native/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUA_MSGPACK_NATIVE
bool "lua-msgpack-native"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help
This is a native, C language implementation of msgpack
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 2afb7c5..0e31858 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUA
bool "lua"
- select BR2_PACKAGE_HAS_LUA_INTERPRETER
+ select BR2_PACKAGE_HAS_LUAINTERPRETER
help
Lua is a powerful, fast, light-weight, embeddable scripting language.
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LUA
if BR2_PACKAGE_LUA
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
default "lua"
choice
diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in
index 3394780..463019d 100644
--- a/package/luaexpat/Config.in
+++ b/package/luaexpat/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_LUAEXPAT
bool "luaexpat"
select BR2_PACKAGE_EXPAT
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help
LuaExpat is a SAX XML parser based on the Expat library.
diff --git a/package/luafilesystem/Config.in b/package/luafilesystem/Config.in
index 489ebf3..50e7975 100644
--- a/package/luafilesystem/Config.in
+++ b/package/luafilesystem/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUAFILESYSTEM
bool "luafilesystem"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
help
LuaFileSystem offers a portable way to access
the underlying directory structure and file attributes.
diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in
index a05bde1..e89a9b8 100644
--- a/package/luainterpreter/Config.in
+++ b/package/luainterpreter/Config.in
@@ -1,9 +1,9 @@
-config BR2_PACKAGE_HAS_LUA_INTERPRETER
+config BR2_PACKAGE_HAS_LUAINTERPRETER
bool
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
string
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
string
diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk
index c37d621..2598550 100644
--- a/package/luainterpreter/luainterpreter.mk
+++ b/package/luainterpreter/luainterpreter.mk
@@ -4,9 +4,6 @@
#
#############################################################
-LUAINTERPRETER_SOURCE =
-LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER))
-
LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION))
-$(eval $(generic-package))
+$(eval $(virtual-package))
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 9c4ecc3..95c2e0f 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUAJIT
bool "luajit"
- select BR2_PACKAGE_HAS_LUA_INTERPRETER
+ select BR2_PACKAGE_HAS_LUAINTERPRETER
# Luajit is only available for some target architectures, and
# has some complexity wrt 32/64. See luajit.mk for details.
depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
@@ -14,7 +14,7 @@ config BR2_PACKAGE_LUAJIT
if BR2_PACKAGE_LUAJIT
-config BR2_PACKAGE_PROVIDES_LUA_INTERPRETER
+config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
default "luajit"
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index a95c825..04269fb 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUAPOSIX
bool "luaposix"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
# LuaBitOp is already included in LuaJIT
help
diff --git a/package/luasec/Config.in b/package/luasec/Config.in
index 48aa766..aa75e05 100644
--- a/package/luasec/Config.in
+++ b/package/luasec/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LUASEC
bool "luasec"
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LUASOCKET
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
depends on !BR2_PACKAGE_LUA_5_2
help
LuaSec is a binding for OpenSSL library to provide TLS/SSL
diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in
index 619d649..45f959e 100644
--- a/package/luasocket/Config.in
+++ b/package/luasocket/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUASOCKET
bool "luasocket"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
help
LuaSocket is the most comprehensive networking support library
for the Lua language.
diff --git a/package/luasql-sqlite3/Config.in b/package/luasql-sqlite3/Config.in
index fca6582..3bd73f3 100644
--- a/package/luasql-sqlite3/Config.in
+++ b/package/luasql-sqlite3/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUASQL_SQLITE3
bool "luasql-sqlite3"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
select BR2_PACKAGE_SQLITE
help
LuaSQL is a simple interface from Lua to a DBMS.
diff --git a/package/rings/Config.in b/package/rings/Config.in
index b1d41f3..87ade07 100644
--- a/package/rings/Config.in
+++ b/package/rings/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_RINGS
bool "rings"
- depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
help
Provides a way to create new Lua states from within Lua.
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 09/10] package/jpeg: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (7 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 08/10] package/luainterpreter: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-25 22:02 ` [Buildroot] [PATCH 10/10] package/cryptodev: " Yann E. MORIN
2014-02-26 8:23 ` [Buildroot] [RFC PATCH 0/10] add new " François Perrad
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Since this package is implemented via a choice rather than the usual
spearate-package providers, we only need BR2_PACKAGE_HAS_JPEG to be
always defined when the 'jpeg' package is selected.
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>
---
package/jpeg/Config.in | 3 +++
package/jpeg/jpeg.mk | 12 +-----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
index b7cdfeb..3042d24 100644
--- a/package/jpeg/Config.in
+++ b/package/jpeg/Config.in
@@ -30,6 +30,9 @@ config BR2_PACKAGE_JPEG_TURBO
endchoice
+config BR2_PACKAGE_HAS_JPEG
+ def_bool y
+
config BR2_PACKAGE_PROVIDES_JPEG
string
default "libjpeg" if BR2_PACKAGE_LIBJPEG
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 3695bc8..2d56be6 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -4,14 +4,4 @@
#
################################################################################
-JPEG_SOURCE =
-JPEG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_JPEG))
-
-ifeq ($(JPEG_DEPENDENCIES),)
-define JPEG_CONFIGURE_CMDS
- echo "No JPEG implementation defined. Configuration error"
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 10/10] package/cryptodev: convert to the virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (8 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 09/10] package/jpeg: " Yann E. MORIN
@ 2014-02-25 22:02 ` Yann E. MORIN
2014-02-26 8:23 ` [Buildroot] [RFC PATCH 0/10] add new " François Perrad
10 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-25 22:02 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Since this package is implemented via a choice rather than the usual
spearate-package providers, we only need BR2_PACKAGE_HAS_CRYPTODEV
to be always defined when the 'cryptodev' package is selected.
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>
---
package/cryptodev/Config.in | 3 +++
package/cryptodev/cryptodev.mk | 12 +-----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/package/cryptodev/Config.in b/package/cryptodev/Config.in
index 0780cc7..2407e04 100644
--- a/package/cryptodev/Config.in
+++ b/package/cryptodev/Config.in
@@ -37,6 +37,9 @@ config BR2_PACKAGE_OCF_LINUX
endchoice
+config BR2_PACKAGE_HAS_CRYPTODEV
+ def_bool y
+
config BR2_PACKAGE_PROVIDES_CRYPTODEV
string
default "cryptodev-linux" if BR2_PACKAGE_CRYPTODEV_LINUX
diff --git a/package/cryptodev/cryptodev.mk b/package/cryptodev/cryptodev.mk
index 11e6f48..969d1bd 100644
--- a/package/cryptodev/cryptodev.mk
+++ b/package/cryptodev/cryptodev.mk
@@ -4,14 +4,4 @@
#
################################################################################
-CRYPTODEV_SOURCE =
-CRYPTODEV_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_CRYPTODEV))
-
-ifeq ($(CRYPTODEV_DEPENDENCIES),)
-define CRYPTODEV_CONFIGURE_CMDS
- echo "No CRYPTODEV implementation defined. Configuration error"
- exit 1
-endef
-endif
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure
2014-02-25 22:02 [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure Yann E. MORIN
` (9 preceding siblings ...)
2014-02-25 22:02 ` [Buildroot] [PATCH 10/10] package/cryptodev: " Yann E. MORIN
@ 2014-02-26 8:23 ` François Perrad
2014-02-26 17:39 ` Arnout Vandecappelle
2014-02-26 18:03 ` Yann E. MORIN
10 siblings, 2 replies; 14+ messages in thread
From: François Perrad @ 2014-02-26 8:23 UTC (permalink / raw)
To: buildroot
2014-02-25 23:02 GMT+01:00 Yann E. MORIN <yann.morin.1998@free.fr>:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Hello All!
>
> Here is a quick series implementing a new infrastructure for virtual
> packages.
>
> Basically, all a virtual package has to do in its .mk is:
>
> $(eval $(virtual-package))
>
> There is no need to:
> - define the dependency against the provider,
> - define _SOURCE="" (empty)
>
> But it requires the config options for the virtual package be named
> after the package, eg.:
>
> package | Selector option | Provider option
> --------+------------------------+-----------------------------
> libegl | BR2_PACKAGE_HAS_LIBEGL | BR2_PACKAGE_PROVIDES_LIBEGL
> jpeg | BR2_PACKAGE_HAS_JPEG | BR2_PACKAGE_PROVIDES_JPEG
>
> So, after the virtual-package infra has been introduced, the series
> goes on to rename some options, and convert some packages over to
> this new infra.
>
> NOTE! This is an RFC! It's not final! This series has hardly been
> tested. Only the dependency chain has been tested to be OK. No
> build-test was performed.
>
Dear Yann,
could you check your new infrastructure with these 2 patches :
http://patchwork.ozlabs.org/patch/323464/
http://patchwork.ozlabs.org/patch/323465/
because for the first time, a virtual package is used on host and target side.
Note that the definition of LUAINTERPRETER_SOURCE is not enough,
the definition of HOST_LUAINTERPRETER_SOURCE is required too.
Fran?ois
> Regards,
> Yann E. MORIN.
>
>
> ----------------------------------------------------------------
> Yann E. MORIN (10):
> package/lua: rename config options
> packages: add infrastructure for virtual packages
> package/powervr: convert to the virtual-package infrastructure
> package/libgles: convert to the virtual-package infrastructure
> package/libegl: convert to the virtual-package infrastructure
> package/libopenmax: convert to the virtual-package infrastructure
> package/libopenvg: convert to the virtual-package infrastructure
> package/luainterpreter: convert to the virtual-package infrastructure
> package/jpeg: convert to the virtual-package infrastructure
> package/cryptodev: convert to the virtual-package infrastructure
>
> Config.in.legacy | 24 +++++++++
> package/Config.in | 2 +-
> package/Makefile.in | 1 +
> package/bellagio/Config.in | 4 +-
> package/cairo/cairo.mk | 4 +-
> package/cryptodev/Config.in | 3 ++
> package/cryptodev/cryptodev.mk | 12 +----
> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 8 +--
> package/gstreamer1/gst-omx/Config.in | 4 +-
> package/gstreamer1/gst1-plugins-bad/Config.in | 2 +-
> package/jpeg/Config.in | 3 ++
> package/jpeg/jpeg.mk | 12 +----
> package/lbase64/Config.in | 2 +-
> package/lua-cjson/Config.in | 2 +-
> package/lua-ev/Config.in | 2 +-
> package/lua-msgpack-native/Config.in | 2 +-
> package/lua/Config.in | 14 +++---
> package/lua/lua.mk | 4 +-
> package/luaexpat/Config.in | 2 +-
> package/luafilesystem/Config.in | 2 +-
> package/luainterpreter/Config.in | 6 +--
> package/luainterpreter/luainterpreter.mk | 5 +-
> package/luajit/Config.in | 4 +-
> package/luaposix/Config.in | 2 +-
> package/luasec/Config.in | 2 +-
> package/luasocket/Config.in | 2 +-
> package/luasql-sqlite3/Config.in | 2 +-
> package/opengl/libegl/Config.in | 6 +--
> package/opengl/libegl/libegl.mk | 12 +----
> package/opengl/libgles/Config.in | 6 +--
> package/opengl/libgles/libgles.mk | 12 +----
> package/opengl/libopenmax/Config.in | 6 +--
> package/opengl/libopenmax/libopenmax.mk | 12 +----
> package/opengl/libopenvg/Config.in | 6 +--
> package/opengl/libopenvg/libopenvg.mk | 12 +----
> package/pkg-virtual.mk | 64 ++++++++++++++++++++++++
> package/powervr/powervr.mk | 12 +----
> package/qt/Config.in | 4 +-
> package/qt5/qt5base/Config.in | 6 +--
> package/qt5/qt5declarative/Config.in | 6 +--
> package/qt5/qt5graphicaleffects/Config.in | 6 +--
> package/qt5/qt5multimedia/Config.in | 6 +--
> package/qt5/qt5quick1/Config.in | 6 +--
> package/qt5/qt5quickcontrols/Config.in | 6 +--
> package/rings/Config.in | 2 +-
> package/rpi-userland/Config.in | 16 +++---
> package/sunxi-mali/Config.in | 8 +--
> package/ti-gfx/Config.in | 8 +--
> 48 files changed, 188 insertions(+), 166 deletions(-)
> create mode 100644 package/pkg-virtual.mk
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure
2014-02-26 8:23 ` [Buildroot] [RFC PATCH 0/10] add new " François Perrad
@ 2014-02-26 17:39 ` Arnout Vandecappelle
2014-02-26 18:03 ` Yann E. MORIN
1 sibling, 0 replies; 14+ messages in thread
From: Arnout Vandecappelle @ 2014-02-26 17:39 UTC (permalink / raw)
To: buildroot
On 26/02/14 09:23, Fran?ois Perrad wrote:
> Dear Yann,
>
> could you check your new infrastructure with these 2 patches :
> http://patchwork.ozlabs.org/patch/323464/
> http://patchwork.ozlabs.org/patch/323465/
> because for the first time, a virtual package is used on host and target side.
>
> Note that the definition of LUAINTERPRETER_SOURCE is not enough,
> the definition of HOST_LUAINTERPRETER_SOURCE is required too.
I was about to say that we don't need a host-virtual-package, but I
guess I was wrong :-)
Regards,
Arnout
--
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [RFC PATCH 0/10] add new virtual-package infrastructure
2014-02-26 8:23 ` [Buildroot] [RFC PATCH 0/10] add new " François Perrad
2014-02-26 17:39 ` Arnout Vandecappelle
@ 2014-02-26 18:03 ` Yann E. MORIN
1 sibling, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-02-26 18:03 UTC (permalink / raw)
To: buildroot
Fran?ois, All,
On 2014-02-26 09:23 +0100, Fran?ois Perrad spake thusly:
> 2014-02-25 23:02 GMT+01:00 Yann E. MORIN <yann.morin.1998@free.fr>:
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Here is a quick series implementing a new infrastructure for virtual
> > packages.
> could you check your new infrastructure with these 2 patches :
> http://patchwork.ozlabs.org/patch/323464/
> http://patchwork.ozlabs.org/patch/323465/
> because for the first time, a virtual package is used on host and target side.
This was just a quick proof-of-concept implementation, mostly targeted
at getting some feedback on the global idea.
I based this ontop of master because I forgot to checkout next first,
and rebasing ontop of -next uncovered some merge conflicts, so I just
aborted the rebase. It will need a bit of love before it is ready.
So, yes, it may be impacted by patches applied on -next, or even patches
pending in Patchwork.
> Note that the definition of LUAINTERPRETER_SOURCE is not enough,
> the definition of HOST_LUAINTERPRETER_SOURCE is required too.
Ah, so we will need to handle the case for host-virtual-packages, too?
I just did not bother doign so for this first rough draft.
Thanks for the report! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 14+ messages in thread