diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 14:31:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-17 14:32:37 +0000 |
commit | 325d205769342f6a50285fb3b0e0fa5c4eaf6d49 (patch) | |
tree | 8fa4027cb2886bad22f63a8037723fc20b85d7c4 /meta | |
parent | 53b114b55f904de55ac37c01ea2929a8e3388de2 (diff) | |
download | poky-325d205769342f6a50285fb3b0e0fa5c4eaf6d49.tar.gz |
gstreamer: Deal with merge conflict which breaks systemd builds
In jethro, the dependency is "udev", the change to libgudev happened
in master after the release and this was a mistake during
backporting of gstreamer fixes.
(From OE-Core rev: bc458ae9586b45b11b6908eadb31e94d892e698f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 2f987b49c6..31b4bda0c5 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | |||
@@ -22,7 +22,7 @@ PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" | |||
22 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" | 22 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" |
23 | PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" | 23 | PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" |
24 | PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" | 24 | PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" |
25 | PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" | 25 | PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" |
26 | PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" | 26 | PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" |
27 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | 27 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" |
28 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | 28 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" |