From ddb88df0eca85b0b2afca68a23c018d39a4c3d78 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Aug 2014 15:26:53 +0100 Subject: qemu: Add PACKAGECONFIG for glx With the configuration for sdl and glx, the virtual/libx11 in DEPENDS no longer makes any sense at all, the dependency comes through the various graphics backends. Therefore drop it. The glx PACKAGECONFIG is added for completeness. We avoid a floating dependency on mesa. Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/qemu') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d717e2b77e..b3ae5d8bb5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -1,8 +1,7 @@ SUMMARY = "Fast open source processor emulator" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "glib-2.0 zlib pixman \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" +DEPENDS = "glib-2.0 zlib pixman" DEPENDS_class-native = "zlib-native glib-2.0-native pixman-native" DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-glib-2.0 nativesdk-pixman" RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" @@ -107,6 +106,7 @@ PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa" EXTRA_OECONF += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '--audio-drv-list=oss,alsa', '', d)}" -- cgit 1.2.3-korg