From f4336262ca16621255591355a1f2156f098a50bd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 11 May 2014 08:48:09 +0200 Subject: gst-plugins-good: add PACKAGECONFIG for x11 * fixes following issues from test-dependencies report: gst-plugins-good/gst-plugins-good-ximagesrc/latest lost dependency on libxdamage (From OE-Core rev: 8da4462b04bdce101efd989ed6b41d88d213baa0) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie Conflicts: meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb --- meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index e0443406a0..88f90f3b85 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ PR = "r8" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg" +PACKAGECONFIG ?= "jpeg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" @@ -16,6 +19,7 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" PACKAGECONFIG[v4l] = "--with-libv4l2,--without-libv4l2,libv4l" PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" +PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage" DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \ speex libsoup-2.4" -- cgit 1.2.3-korg