diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:13:35 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-26 09:33:28 +0000 |
| commit | 0ded646a83768868a1cc4dceb962ee707348af1b (patch) | |
| tree | e943375921deceebde2b3b5769f80d8ff861d2cb /meta/recipes-devtools/qemu | |
| parent | 0e359ba5134d8071c590936e0348e5bf97919845 (diff) | |
| download | openembedded-core-contrib-0ded646a83768868a1cc4dceb962ee707348af1b.tar.gz | |
qemu: Depend on libepoxy instead of virtual/libgl
- This abstracts on GL/GLES implementations
- Rename packageconfig to epoxy to match what code it doing underneath
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-devtools/qemu')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_6.2.0.bb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb index b544ab4e81..bc5384d472 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native me EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" PACKAGECONFIG ??= "fdt alsa kvm pie \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ " # Handle distros such as CentOS 5 32-bit that do not have kvm support diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 78aea71cc0..e9d2dae040 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -142,8 +142,8 @@ do_install:append() { # END of qemu-mips workaround # Disable kvm/virgl/mesa on targets that do not support it -PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" -PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+" +PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," @@ -165,7 +165,7 @@ PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib" -PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" +PACKAGECONFIG[epoxy] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" diff --git a/meta/recipes-devtools/qemu/qemu_6.2.0.bb b/meta/recipes-devtools/qemu/qemu_6.2.0.bb index c7eef0a9d5..92857adf9c 100644 --- a/meta/recipes-devtools/qemu/qemu_6.2.0.bb +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb @@ -17,9 +17,9 @@ EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d) PACKAGECONFIG ??= " \ fdt sdl kvm pie \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ " PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ " |