From 153773e62ba00c19e9094369d5c2c681b2c94365 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Aug 2014 15:25:52 +0100 Subject: qemu: Add alsa PACKAGECONFIG and cleanup native/nativesdk DEPENDS Converting this dependency to become a PACKAGECONFIG makes sense. Since there is a "," in the configuration option, its not quite as straightforward as normal. Also clean up the native and nativesdk DEPENDS and set the PACKAGECONFIG entries to match the old behaviour by default. (From OE-Core rev: f724085b4947ec8437d48f77acd2e9e9d19e39ef) Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'meta/recipes-devtools/qemu/qemu.inc') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4d764d3985..d717e2b77e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -1,10 +1,10 @@ SUMMARY = "Fast open source processor emulator" HOMEPAGE = "http://qemu.org" LICENSE = "GPLv2 & LGPLv2.1" -DEPENDS = "glib-2.0 zlib alsa-lib pixman \ +DEPENDS = "glib-2.0 zlib pixman \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" -DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" -DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" +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" RDEPENDS_${PN}_class-target += "bash python" @@ -26,7 +26,7 @@ SRC_URI_append_class-native = "\ file://fix-libcap-header-issue-on-some-distro.patch \ " -EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'" +EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'" EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror \ " @@ -83,7 +83,9 @@ do_install_append() { } # END of qemu-mips workaround -PACKAGECONFIG ??= "fdt sdl" +PACKAGECONFIG ??= "fdt sdl alsa" +PACKAGECONFIG_class-native ??= "fdt alsa" +PACKAGECONFIG_class-nativesdk ??= "fdt sdl" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," @@ -104,6 +106,9 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl," 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" + +EXTRA_OECONF += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '--audio-drv-list=oss,alsa', '', d)}" # Qemu target will not build in world build for ARM or Mips BROKEN_qemuarm = "1" -- cgit v1.2.3-54-g00ecf