* [PATCH v3] qemu: Depend on libepoxy instead of virtual/libgl
@ 2022-03-24 2:11 Khem Raj
2022-03-24 13:26 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2022-03-24 2:11 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexandre Belloni, Khem Raj
- 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>
---
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(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 78aea71cc05..e9d2dae0405 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 c7eef0a9d5e..92857adf9c3 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)} \
"
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH v3] qemu: Depend on libepoxy instead of virtual/libgl
2022-03-24 2:11 [PATCH v3] qemu: Depend on libepoxy instead of virtual/libgl Khem Raj
@ 2022-03-24 13:26 ` Alexandre Belloni
2022-03-24 13:36 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2022-03-24 13:26 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
Hi Khem,
On 23/03/2022 19:11:41-0700, Khem Raj wrote:
> - 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
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> 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(-)
>
> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> index 78aea71cc05..e9d2dae0405 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 c7eef0a9d5e..92857adf9c3 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)} \
> "
> --
> 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: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH v3] qemu: Depend on libepoxy instead of virtual/libgl
2022-03-24 13:26 ` [OE-core] " Alexandre Belloni
@ 2022-03-24 13:36 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2022-03-24 13:36 UTC (permalink / raw)
To: alexandre.belloni, Khem Raj; +Cc: openembedded-core
On Thu, 2022-03-24 at 14:26 +0100, Alexandre Belloni via lists.openembedded.org
wrote:
> Hi Khem,
>
> On 23/03/2022 19:11:41-0700, Khem Raj wrote:
> > - 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
>
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > 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(-)
> >
> > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> > index 78aea71cc05..e9d2dae0405 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 c7eef0a9d5e..92857adf9c3 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)} \
> > "
> > --
> > 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-24 13:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-24 2:11 [PATCH v3] qemu: Depend on libepoxy instead of virtual/libgl Khem Raj
2022-03-24 13:26 ` [OE-core] " Alexandre Belloni
2022-03-24 13:36 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox