From ade5e668dcaddf607b0b45baaab397e876a1d7f2 Mon Sep 17 00:00:00 2001 From: Randolph Sapp Date: Sat, 6 May 2023 02:37:42 +0000 Subject: [PATCH] cairo: resolve opengl version Cairo can either be built for use with OpenGL or OpenGLES. By default it assumes it can use OpenGL if X11 is provided as a distro feature. This assumption is not true when using the proprietary SGX / Rogue drivers. Vulkan libraries need some X libs at runtime now, so we need to manually override the PACKAGECONFIG for cairo to use OpenGLES. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 + meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend new file mode 100644 index 00000000..459d8d09 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc new file mode 100644 index 00000000..b41f1a01 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc @@ -0,0 +1,5 @@ +# This is required since cairo expects the opengl distro feature to refer to +# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. + +PACKAGECONFIG:remove = "opengl" +PACKAGECONFIG:append = " glesv2"