diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-03-18 23:29:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 23:56:05 +0000 |
commit | d6be13a6d16473043080e793c0f6cd7e80833eac (patch) | |
tree | d14814dac776436e4db5d9953f920bade4404692 | |
parent | 76930a5ed83aaa204b8e3003cac4ca1bdec618dc (diff) | |
download | poky-d6be13a6d16473043080e793c0f6cd7e80833eac.tar.gz |
gst-plugins-good: fix nondeterministic udev dependency
Make the v4l PACKAGECONFIG option control building of the video4linux2
plug-in (not use of libv4l, as it did before) and enable by default.
Add a separate libv4l PACKAGECONFIG to control use of libv4l (disabled
by default since libv4l is not part of oe-core).
The default config for gst-plugins-good and gstreamer1.0-plugins-good
is now aligned with regards to v4l, ie:
v4l support: enabled by default
v4l use of libgudev: enabled by default
v4l use of libv4l2: disabled by default
This commit fixes the following build-deps QA Warnings:
WARNING: QA Issue: gst-plugins-good-video4linux2 rdepends on libudev, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: gst-plugins-good-video4linux2 rdepends on libgudev, but it isn't a build dependency? [build-deps]
(From OE-Core rev: e084060b59f2ad2ca5e3896afb2ff2dfb665cc67)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index 85f2196fd4..af18281715 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | |||
7 | 7 | ||
8 | PR = "r8" | 8 | PR = "r8" |
9 | 9 | ||
10 | PACKAGECONFIG ?= "jpeg \ | 10 | PACKAGECONFIG ?= "jpeg v4l \ |
11 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 11 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
13 | " | 13 | " |
@@ -16,7 +16,9 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | |||
16 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | 16 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" |
17 | PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" | 17 | PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" |
18 | PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" | 18 | PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" |
19 | PACKAGECONFIG[v4l] = "--with-libv4l2,--without-libv4l2,libv4l" | 19 | PACKAGECONFIG[v4l] = "--enable-gst_v4l2 --with-gudev,--disable-gst_v4l2 --without-gudev,udev" |
20 | # sub-feature of v4l, but control separately since libv4l is not part of oe-core | ||
21 | PACKAGECONFIG[libv4l] = "--with-libv4l2,--without-libv4l2,libv4l" | ||
20 | PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2" | 22 | PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2" |
21 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | 23 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" |
22 | PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage" | 24 | PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage" |