MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

mesa: fold GL ES 3 packages into GL ES 2 ones

Browse Source 
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.

Suggested-by: Böszörményi Zoltán <zboszor@gmail.com>
(From OE-Core rev: 7c0e9c170db93d9af7cc505dcd71c4f3d6c4e9c5)

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dmitry Baryshkov 2025-05-22 20:13:27 +03:00 committed by Richard Purdie
parent c387e17d92
commit 14fe96c8e5
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-graphics/mesa/mesa.inc
View File

@ -231,17 +231,10 @@ CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS"
# Remove the mesa dependency on mesa-dev, as mesa is empty # Remove the mesa dependency on mesa-dev, as mesa is empty
DEV_PKG_DEPENDENCY = "" 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. # 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. # Add a dependency so the GLES3 dev package is associated with its implementation.
RDEPENDS:libgles2-mesa += "libgles3-mesa" RPROVIDES:libgles2-mesa += "libgles3-mesa"
ALLOW_EMPTY:libgles3-mesa = "1" RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev"
RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}"
@ -253,7 +246,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libgbm libgbm-dev \ libgbm libgbm-dev \
libgles1-mesa libgles1-mesa-dev \ libgles1-mesa libgles1-mesa-dev \
libgles2-mesa libgles2-mesa-dev \ libgles2-mesa libgles2-mesa-dev \
libgles3-mesa libgles3-mesa-dev \
libopencl-mesa libopencl-mesa-dev \ libopencl-mesa libopencl-mesa-dev \
libxatracker libxatracker-dev \ libxatracker libxatracker-dev \
mesa-megadriver mesa-vulkan-drivers \ mesa-megadriver mesa-vulkan-drivers \
@ -278,8 +270,7 @@ python __anonymous() {
("opengl", "libgl", "libgl1"), ("opengl", "libgl", "libgl1"),
("glvnd", "libglx",), ("glvnd", "libglx",),
("gles", "libgles1", "libglesv1-cm1"), ("gles", "libgles1", "libglesv1-cm1"),
("gles", "libgles2", "libglesv2-2"), ("gles", "libgles2", "libglesv2-2", "libgles3"),
("gles", "libgles3",),
("opencl", "libopencl",)): ("opencl", "libopencl",)):
if not p[0] in pkgconfig: if not p[0] in pkgconfig:
continue continue
@ -353,8 +344,7 @@ FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/g
FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" FILES:libglx-mesa-dev = "${libdir}/libGLX*.*"
FILES:libglapi-dev = "${libdir}/libglapi.*" FILES:libglapi-dev = "${libdir}/libglapi.*"
FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" 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:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc"
FILES:libgles3-mesa-dev = "${includedir}/GLES3"
FILES:libopencl-mesa-dev = "${libdir}/lib*OpenCL.so" FILES:libopencl-mesa-dev = "${libdir}/lib*OpenCL.so"
FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \