From 21b6a15594f15dc90c86b2ec9a7e3dc5b91de0c4 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Thu, 29 May 2025 15:38:33 -0500 Subject: mesa-pvr: fold GL ES 3 packages into GL ES 2 ones This is a sideport of a patch against mesa in oe-core [1]. OpenGL ES 3 is closely tied to the OpenGL ES 2: there is no separate library, one can use GL ES 2 headers for GL ES 3 app, etc. Instead of having separate packages, merge GL ES 3 packages into GL ES 2 ones. [1] https://git.openembedded.org/openembedded-core/commit/?id=7c0e9c170db93d9af7cc505dcd71c4f3d6c4e9c5 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc index 471475ff..45d5ada3 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc @@ -228,17 +228,10 @@ CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS" # Remove the mesa dependency on mesa-dev, as mesa is empty DEV_PKG_DEPENDENCY = "" -# Khronos documentation says that include/GLES2/gl2ext.h can be used for -# OpenGL ES 3 specification as well as for OpenGL ES 2. -# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h -# meaning we should probably bring in GLES2/gl2ext.h if someone asks for -# development package of libgles3. -RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" - # GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa. # Add a dependency so the GLES3 dev package is associated with its implementation. -RDEPENDS:libgles2-mesa += "libgles3-mesa" -ALLOW_EMPTY:libgles3-mesa = "1" +RPROVIDES:libgles2-mesa += "libgles3-mesa" +RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" @@ -250,7 +243,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgbm libgbm-dev \ libgles1-mesa libgles1-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ - libgles3-mesa libgles3-mesa-dev \ libopencl-mesa libopencl-mesa-dev \ libxatracker libxatracker-dev \ mesa-megadriver mesa-vulkan-drivers \ @@ -288,8 +280,7 @@ python __anonymous() { ("opengl", "libgl", "libgl1"), ("glvnd", "libglx",), ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2"), - ("gles", "libgles3",), + ("gles", "libgles2", "libglesv2-2", "libgles3"), ("opencl", "libopencl",)): if not p[0] in pkgconfig: continue @@ -363,8 +354,7 @@ FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/g FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" FILES:libglapi-dev = "${libdir}/libglapi.*" FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" -FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES:libgles3-mesa-dev = "${includedir}/GLES3" +FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc" FILES:libopencl-mesa-dev = "${libdir}/libMesaOpenCL.so" FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ -- cgit v1.2.3-54-g00ecf