summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-14 15:26:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:47 +0100
commit42f0ffe6f8147bf20f58a47b3f150d922dcfc14d (patch)
tree5d1451c43e7c7326b928e74441214b28389a416b /meta
parent153773e62ba00c19e9094369d5c2c681b2c94365 (diff)
downloadpoky-42f0ffe6f8147bf20f58a47b3f150d922dcfc14d.tar.gz
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. (From OE-Core rev: ddb88df0eca85b0b2afca68a23c018d39a4c3d78) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
1 files changed, 2 insertions, 2 deletions
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 @@
1SUMMARY = "Fast open source processor emulator" 1SUMMARY = "Fast open source processor emulator"
2HOMEPAGE = "http://qemu.org" 2HOMEPAGE = "http://qemu.org"
3LICENSE = "GPLv2 & LGPLv2.1" 3LICENSE = "GPLv2 & LGPLv2.1"
4DEPENDS = "glib-2.0 zlib pixman \ 4DEPENDS = "glib-2.0 zlib pixman"
5 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
6DEPENDS_class-native = "zlib-native glib-2.0-native pixman-native" 5DEPENDS_class-native = "zlib-native glib-2.0-native pixman-native"
7DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-glib-2.0 nativesdk-pixman" 6DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-glib-2.0 nativesdk-pixman"
8RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" 7RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
@@ -107,6 +106,7 @@ PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
107PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" 106PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
108PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" 107PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
109PACKAGECONFIG[alsa] = ",,alsa-lib" 108PACKAGECONFIG[alsa] = ",,alsa-lib"
109PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
110 110
111EXTRA_OECONF += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '--audio-drv-list=oss,alsa', '', d)}" 111EXTRA_OECONF += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '--audio-drv-list=oss,alsa', '', d)}"
112 112