[oe-commits] Otavio Salvador : v4l-utils: Fix media-ctl support

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 4bbc8ace29adbbca196444bb9e1a77e0dd156c24
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4bbc8ace29adbbca196444bb9e1a77e0dd156c24

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Wed Mar  4 11:42:20 2015 -0300

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 at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb | 9 +++------
 1 file 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 9bbfaee..cea97dc 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 pkgconfig
 
-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 \