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:31:33 +0000 |
| commit | bc458ae9586b45b11b6908eadb31e94d892e698f (patch) | |
| tree | 20423a117956d12d84eeaebcfca3d45baf77cddc /meta | |
| parent | bc1d59a075bfd1b0dca7a19553cc7970b7460b38 (diff) | |
| download | openembedded-core-contrib-bc458ae9586b45b11b6908eadb31e94d892e698f.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.
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" PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" -PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" +PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" |