summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:08:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:10:32 +0000
commitb83220257a38c9d70ad4818e4102041b2885e332 (patch)
treee6ee91900e4cc763d8d961869403179cf37e5717 /meta/recipes-multimedia
parentdd0ba9ea4a11ab15348d4fe3574e4b28784db82f (diff)
downloadpoky-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.inc2
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"
22PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" 22PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo"
23PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" 23PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
24PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" 24PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
25PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" 25PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev"
26PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" 26PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2"
27PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 27PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
28PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 28PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"