aboutsummaryrefslogtreecommitdiffstats
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:08:59 +0000
commitdee9d64d1f836006d082d4ab0f185c6b67c1b1a1 (patch)
treef5f53b0f84b8e70cbdf83edc9b6de295e2a8ae49
parent716d3140c150bb3d99210e74da91904efc84c907 (diff)
downloadopenembedded-core-contrib-dee9d64d1f836006d082d4ab0f185c6b67c1b1a1.tar.gz
openembedded-core-contrib-dee9d64d1f836006d082d4ab0f185c6b67c1b1a1.tar.bz2
openembedded-core-contrib-dee9d64d1f836006d082d4ab0f185c6b67c1b1a1.zip
Revert "gstreamer: Deal with merge conflict which breaks systemd builds"
This reverts commit bc458ae9586b45b11b6908eadb31e94d892e698f. The original change was intentional so back out 'fixes'.
-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"
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,udev"
+PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev"
PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2"
PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"