diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:10:32 +0000 |
commit | b83220257a38c9d70ad4818e4102041b2885e332 (patch) | |
tree | e6ee91900e4cc763d8d961869403179cf37e5717 /meta/recipes-multimedia | |
parent | dd0ba9ea4a11ab15348d4fe3574e4b28784db82f (diff) | |
download | poky-b83220257a38c9d70ad4818e4102041b2885e332.tar.gz |
Revert "gstreamer: Deal with merge conflict which breaks systemd builds"
This reverts commit bc458ae9586b45b11b6908eadb31e94d892e698f.
The original change was intentional so back out 'fixes'.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-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 31b4bda0c5..2f987b49c6 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,udev" | 25 | PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" |
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" |