qemu: Depend on virtual/egl
PATCH 1/5 qemu: Depend on virtual/egl
This abstracts on GL/GLES implementations
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -163,7 +163,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[glx] = "--enable-opengl,--disable-opengl,virtual/egl" PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
Signature · 1 line
2.35.1
PATCH 2/5 libsdl2: Depend on virtual/egl
virtual/libgl may not be implemented by some non-mesa graphics in embedded space, this ensures that libsdl2 can build on such stacks
--- meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +1 -1
@@ -67,7 +67,7 @@ PACKAGECONFIG[directfb] = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,direc PACKAGECONFIG[gles2] = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2" PACKAGECONFIG[jack] = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack" PACKAGECONFIG[kmsdrm] = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm" -PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl" PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[wayland] = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon" PACKAGECONFIG[x11] = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender"
Signature · 1 line
2.35.1
Re: [OE-core] [PATCH 2/5] libsdl2: Depend on virtual/egl
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb PACKAGECONFIG[directfb] = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,direc · line 70
Quoted 2 lines · Khem Raj
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +1
-1-PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl"
What does libSDL2 look for, then? Is it EGL explicitly? Or GLX? Or something else.
I agree that the virtual/libgl thing is a mess, but if we're clearing it up we need to clear about what is changing.
Ross
Re: [OE-core] [PATCH 2/5] libsdl2: Depend on virtual/egl
Quoted 7 lines · Ross Burton
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb PACKAGECONFIG[directfb] = "-DSDL_DIRECTFB=ON,-DSDL_DIRECTFB=OFF,directfb,direc · line 70
Quoted 2 lines · Khem Raj
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb +1
-1-PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/libgl" +PACKAGECONFIG[opengl] = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl"What does libSDL2 look for, then? Is it EGL explicitly? Or GLX? Or something else.
it looks for egl implementation provider which in X case is same as virtual/libgl provider ( mesa )
in next release I think we should make clear difference between openGL implementations instead of
specifying pins on libraries
Quoted 5 lines
I agree that the virtual/libgl thing is a mess, but if we're clearing it up we need to clear about what is changing.
Ross
PATCH 3/5 piglit: Remove virtual/libgl
In reply to Khem Rajvirtual/libgl is usually provided by same package that provides virtual/egl by the stacks which implement it, removing virtual/libgl means we can build it on stacks not implementing GL
--- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git" X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}" X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}" -DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl" +DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl" inherit cmake pkgconfig python3native features_check bash-completion
Signature · 1 line
2.35.1
PATCH 4/5 waffle: Use the right dependencies as needed
In reply to Khem Rajusing virtual/libgl is a broad brush, we can be more specific and ask for dependencies which are really needed
--- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
meta/recipes-graphics/waffle/waffle_1.7.0.bb +7 -7
@@ -31,16 +31,16 @@ REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX # I say virtual/libgl, actually wants gl.pc PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11" -# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland +# wants wayland-egl.pc, egl.pc, and the wayland # DISTRO_FEATURE. -PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native wayland-protocols" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" -# I say virtual/libgl, actually wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev" +# wants gbm.pc egl.pc +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm udev" -# I say virtual/libgl, actually wants egl.pc -PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}libgl libxcb" -PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl" +# wants egl.pc +PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" +PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}egl" # TODO: optionally build manpages and examples
Signature · 1 line
2.35.1
PATCH 5/5 webkitgtk: Depend on virtual/egl instead of virtual/libgl
In reply to Khem RajThis ensures that platforms not implementing GL ( perhaps only providing GLES ) are able to build webkit
--- meta/recipes-sato/webkit/webkitgtk_2.34.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.34.6.bb +2 -2
@@ -60,8 +60,8 @@ PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/lib PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" -PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/libgl" -PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/libgl" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
Signature · 1 line
2.35.1
meta/recipes-devtools/qemu/qemu.inc PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" · line 166
Quoted 2 lines · Khem Raj
meta/recipes-devtools/qemu/qemu.inc +1
-1-PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/egl"
Either the packageconfig name is wrong, or this patch is wrong: GLX is explicitly big-GL not EGL.
Ross
Quoted 7 lines · Ross Burton
meta/recipes-devtools/qemu/qemu.inc PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" · line 166
Quoted 2 lines · Khem Raj
meta/recipes-devtools/qemu/qemu.inc +1
-1-PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/egl"Either the packageconfig name is wrong, or this patch is wrong: GLX is explicitly big-GL not EGL.
Neither seems to be wrong. see
https://github.com/qemu/qemu/blob/master/configure#L2289-L2313
It's expecting epoxy with egl. So virtual/egl is a better representation. Maybe we should
add epoxy to depends section of packageconfig separately.
Quoted 2 lines
Ross
Quoted 9 lines · Khem Raj
Quoted 7 lines · Ross Burton
meta/recipes-devtools/qemu/qemu.inc PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" · line 166
Quoted 2 lines · Khem Raj
meta/recipes-devtools/qemu/qemu.inc +1
-1-PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/egl"Either the packageconfig name is wrong, or this patch is wrong: GLX is explicitly big-GL not EGL.
Quoted 6 lines
Neither seems to be wrong. see
https://github.com/qemu/qemu/blob/master/configure#L2289-L2313It's expecting epoxy with egl. So virtual/egl is a better representation. Maybe we should
add epoxy to depends section of packageconfig separately.
I think Ross' point is that the PACKAGECONFIG option could do with renaming since it isn't GLX at all...
Cheers,
Richard