qemu: Depend on libepoxy instead of virtual/libgl
PATCH v3 1/1 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
---
v2: Rename packageconfig to epoxy as it matches code
v3: Depend on libepoxy instead of virtual/egl
meta/recipes-devtools/qemu/qemu.inc | 6 +++--- meta/recipes-devtools/qemu/qemu_6.2.0.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +3 -3
@@ -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"
meta/recipes-devtools/qemu/qemu_6.2.0.bb +2 -2
@@ -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)} \ "
Signature · 1 line
2.35.1
Hi Khem,
Quoted 2 lines · Khem Raj
- This abstracts on GL/GLES implementations
- Rename packageconfig to epoxy to match what code it doing underneath
This is not working either and I guess we will need to go and fix all the layers using the glx packageconfig:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3413
Quoted 63 lines
Signed-off-by Khem Raj <[email protected]>---
v2: Rename packageconfig to epoxy as it matches code
v3: Depend on libepoxy instead of virtual/eglmeta/recipes-devtools/qemu/qemu.inc | 6 +++--- meta/recipes-devtools/qemu/qemu_6.2.0.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/qemu/qemu.inc +3
-3@@ -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"meta/recipes-devtools/qemu/qemu_6.2.0.bb +2
-2@@ -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)} \ "Signature · 11 lines
2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163600): https://lists.openembedded.org/g/openembedded-core/message/163600 Mute This Topic: https://lists.openembedded.org/mt/89991450/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 56 lines · Alexandre Belloni via lists.openembedded.org
Hi Khem,
Quoted 2 lines · Khem Raj
- This abstracts on GL/GLES implementations
- Rename packageconfig to epoxy to match what code it doing underneathThis is not working either and I guess we will need to go and fix all the layers using the glx packageconfig:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3413
Quoted 45 lines
Signed-off-by Khem Raj <[email protected]>---
v2: Rename packageconfig to epoxy as it matches code
v3: Depend on libepoxy instead of virtual/eglmeta/recipes-devtools/qemu/qemu.inc | 6 +++--- meta/recipes-devtools/qemu/qemu_6.2.0.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)meta/recipes-devtools/qemu/qemu.inc +3
-3@@ -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"meta/recipes-devtools/qemu/qemu_6.2.0.bb +1
-1@@ -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)} \
Quoted 8 lines
Quoted 8 lines
meta/recipes-devtools/qemu/qemu_6.2.0.bb +1
-1" 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)} \ "Signature · 1 line
2.35.1
I think there is a reference missed here:
qemu-system-native_6.0.0.bb: ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '', d)} \
Cheers,
Richard