diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-03-04 11:42:20 -0300 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2015-06-27 11:37:10 +0200 |
commit | 133facbb58780a90dca2f157cbd5adf36f57b792 (patch) | |
tree | 314c254a3bbb617b6abe551c6ef62116fa883ccc | |
parent | 89fb44fba8d537c61e4e7edf833c848dce0f3747 (diff) | |
download | meta-openembedded-contrib-133facbb58780a90dca2f157cbd5adf36f57b792.tar.gz |
v4l-utils: Fix media-ctl support
The media-ctl package is generated with same name, but from a
different source. To offer an upgrade path the only change necessary
is to add 'media-ctl' in the PROVIDES so dependencies for build can be
satisfied.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 2333313d50019d13bb1ecbcb2c6e795fc3ddb77a)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r-- | meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb index 0487da65ce..7724c5896f 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb @@ -2,18 +2,15 @@ SUMMARY = "v4l2 and IR applications" LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" +PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" inherit autotools gettext -PACKAGECONFIG ??= "" -PACKAGECONFIG[mediactl] = "--enable-v4l-utils,--disable-v4l-utils,," -# libv4l was absorbed into this, let OE know that -PROVIDES = "libv4l media-ctl" -PROVIDES += "${@base_contains('PACKAGECONFIG', 'mediactl', 'media-ctl', '', d)}" -RPROVIDES_${PN} += "${@base_contains('PACKAGECONFIG', 'mediactl', 'media-ctl', '', d)}" +PACKAGECONFIG ??= "media-ctl" +PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ |