add new virtual-package infrastructure
Subsystems (2)
cover add new virtual-package infrastructure
From: "Yann E. MORIN" <[email protected]>
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.
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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/10 package/lua: rename config options
From: "Yann E. MORIN" <[email protected]>
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'.
--- Config.in.legacy | 24 ++++++++++++++++++++++++ package/lua/Config.in | 10 +++++----- package/lua/lua.mk | 4 ++-- 3 files changed, 31 insertions(+), 7 deletions(-)
Config.in.legacy +24 -0
@@ -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
package/lua/Config.in +5 -5
@@ -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
package/lua/lua.mk +2 -2
@@ -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
Signature · 1 line
1.8.3.2
PATCH 2/10 packages: add infrastructure for virtual packages
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
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. :-)
--- package/Makefile.in | 1 + package/pkg-virtual.mk | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 package/pkg-virtual.mk
package/Makefile.in +1 -0
@@ -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
package/pkg-virtual.mk new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 3/10 package/powervr: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/powervr/powervr.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
package/powervr/powervr.mk +1 -11
@@ -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))
Signature · 1 line
1.8.3.2
PATCH 4/10 package/libgles: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- 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(-)
package/cairo/cairo.mk +1 -1
@@ -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
package/freescale-imx/gpu-viv-bin-mx6q/Config.in +2 -2
@@ -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
package/gstreamer1/gst1-plugins-bad/Config.in +1 -1
@@ -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
package/opengl/libgles/Config.in +3 -3
@@ -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
package/opengl/libgles/libgles.mk +1 -11
@@ -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))
package/qt/Config.in +1 -1
@@ -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.
package/qt5/qt5base/Config.in +2 -2
@@ -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"
package/qt5/qt5declarative/Config.in +2 -2
@@ -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
package/qt5/qt5graphicaleffects/Config.in +2 -2
@@ -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
package/qt5/qt5multimedia/Config.in +2 -2
@@ -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
package/qt5/qt5quick1/Config.in +2 -2
@@ -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
package/qt5/qt5quickcontrols/Config.in +2 -2
@@ -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
package/rpi-userland/Config.in +2 -2
@@ -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
package/sunxi-mali/Config.in +2 -2
@@ -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
package/ti-gfx/Config.in +2 -2
@@ -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
Signature · 1 line
1.8.3.2
PATCH 5/10 package/libegl: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- 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(-)
package/freescale-imx/gpu-viv-bin-mx6q/Config.in +2 -2
@@ -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
package/gstreamer1/gst1-plugins-bad/Config.in +1 -1
@@ -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
package/opengl/libegl/Config.in +3 -3
@@ -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
package/opengl/libegl/libegl.mk +1 -11
@@ -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))
package/qt/Config.in +1 -1
@@ -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.
package/qt5/qt5base/Config.in +2 -2
@@ -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"
package/qt5/qt5declarative/Config.in +2 -2
@@ -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
package/qt5/qt5graphicaleffects/Config.in +2 -2
@@ -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
package/qt5/qt5multimedia/Config.in +2 -2
@@ -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
package/qt5/qt5quick1/Config.in +2 -2
@@ -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
package/qt5/qt5quickcontrols/Config.in +2 -2
@@ -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
package/rpi-userland/Config.in +2 -2
@@ -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
package/sunxi-mali/Config.in +2 -2
@@ -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
package/ti-gfx/Config.in +2 -2
@@ -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
Signature · 1 line
1.8.3.2
PATCH 6/10 package/libopenmax: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- 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(-)
package/bellagio/Config.in +2 -2
@@ -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
package/gstreamer1/gst-omx/Config.in +2 -2
@@ -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
package/opengl/libopenmax/Config.in +3 -3
@@ -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
package/opengl/libopenmax/libopenmax.mk +1 -11
@@ -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))
package/rpi-userland/Config.in +2 -2
@@ -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
Signature · 1 line
1.8.3.2
PATCH 7/10 package/libopenvg: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- 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(-)
package/cairo/cairo.mk +1 -1
@@ -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
package/opengl/libopenvg/Config.in +3 -3
@@ -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
package/opengl/libopenvg/libopenvg.mk +1 -11
@@ -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))
package/rpi-userland/Config.in +2 -2
@@ -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
Signature · 1 line
1.8.3.2
PATCH 8/10 package/luainterpreter: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- 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(-)
package/Config.in +1 -1
@@ -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"
package/lbase64/Config.in +1 -1
@@ -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
package/lua-cjson/Config.in +1 -1
@@ -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
package/lua-ev/Config.in +1 -1
@@ -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
package/lua-msgpack-native/Config.in +1 -1
@@ -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
package/lua/Config.in +2 -2
@@ -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
package/luaexpat/Config.in +1 -1
@@ -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.
package/luafilesystem/Config.in +1 -1
@@ -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.
package/luainterpreter/Config.in +3 -3
@@ -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
package/luainterpreter/luainterpreter.mk +1 -4
@@ -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))
package/luajit/Config.in +2 -2
@@ -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
package/luaposix/Config.in +1 -1
@@ -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
package/luasec/Config.in +1 -1
@@ -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
package/luasocket/Config.in +1 -1
@@ -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.
package/luasql-sqlite3/Config.in +1 -1
@@ -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.
package/rings/Config.in +1 -1
@@ -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.
Signature · 1 line
1.8.3.2
PATCH 9/10 package/jpeg: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
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.
--- package/jpeg/Config.in | 3 +++ package/jpeg/jpeg.mk | 12 +----------- 2 files changed, 4 insertions(+), 11 deletions(-)
package/jpeg/Config.in +3 -0
@@ -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
package/jpeg/jpeg.mk +1 -11
@@ -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))
Signature · 1 line
1.8.3.2
PATCH 10/10 package/cryptodev: convert to the virtual-package infrastructure
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
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.
--- package/cryptodev/Config.in | 3 +++ package/cryptodev/cryptodev.mk | 12 +----------- 2 files changed, 4 insertions(+), 11 deletions(-)
package/cryptodev/Config.in +3 -0
@@ -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
package/cryptodev/cryptodev.mk +1 -11
@@ -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))
Signature · 1 line
1.8.3.2
cover add new virtual-package infrastructure
In reply to Yann E. MORIN2014-02-25 23:02 GMT+01:00 Yann E. MORIN <[email protected]>:
Quoted 23 lines
From: "Yann E. MORIN" <[email protected]>
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
Quoted 8 lines
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
Quoted 79 lines
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 infrastructureConfig.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
cover add new virtual-package infrastructure
Quoted 9 lines · Fran?ois Perrad
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_SOURCEis not enough, the definition ofHOST_LUAINTERPRETER_SOURCEis required too.
I was about to say that we don't need a host-virtual-package, but I
guess I was wrong :-)
Regards,
Arnout
Signature · 6 lines
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
cover add new virtual-package infrastructure
In reply to François PerradFran?ois, All,
On 2014-02-26 09:23 +0100, Fran?ois Perrad spake thusly:
Quoted 8 lines
2014-02-25 23:02 GMT+01:00 Yann E. MORIN <[email protected]>:
Quoted 3 lines
From: "Yann E. MORIN" <[email protected]>
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.
Quoted 2 lines
Note that the definition of
LUAINTERPRETER_SOURCEis not enough, the definition ofHOST_LUAINTERPRETER_SOURCEis 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.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'