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:32 +0000 |
commit | 981cb14b422597fb03f76ab92d1b1ffd3dea9053 (patch) | |
tree | 4df0d72b962a1dcda3d2191bc4c21281a61e1384 /meta/recipes-devtools | |
parent | fe7b07476b244ed0f800f88ef366543408818afe (diff) | |
download | poky-981cb14b422597fb03f76ab92d1b1ffd3dea9053.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
(From OE-Core rev: 0ded646a83768868a1cc4dceb962ee707348af1b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 | |||
12 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 12 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
13 | 13 | ||
14 | PACKAGECONFIG ??= "fdt alsa kvm pie \ | 14 | PACKAGECONFIG ??= "fdt alsa kvm pie \ |
15 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ | 15 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
16 | " | 16 | " |
17 | 17 | ||
18 | # Handle distros such as CentOS 5 32-bit that do not have kvm support | 18 | # 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() { | |||
142 | # END of qemu-mips workaround | 142 | # END of qemu-mips workaround |
143 | 143 | ||
144 | # Disable kvm/virgl/mesa on targets that do not support it | 144 | # Disable kvm/virgl/mesa on targets that do not support it |
145 | PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" | 145 | PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+" |
146 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" | 146 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" |
147 | 147 | ||
148 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" | 148 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" |
149 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," | 149 | 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" | |||
165 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" | 165 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" |
166 | PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" | 166 | PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" |
167 | PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib" | 167 | PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib" |
168 | PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" | 168 | PACKAGECONFIG[epoxy] = "--enable-opengl,--disable-opengl,libepoxy" |
169 | PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" | 169 | PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" |
170 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" | 170 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" |
171 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" | 171 | 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) | |||
17 | PACKAGECONFIG ??= " \ | 17 | PACKAGECONFIG ??= " \ |
18 | fdt sdl kvm pie \ | 18 | fdt sdl kvm pie \ |
19 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ | 19 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
21 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ | 21 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ |
22 | " | 22 | " |
23 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie \ | 23 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm pie \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \ |
25 | " | 25 | " |