mesa: make sure GLES3 headers are installed

Message ID 20220308085812.973165-1-samuli.piippo@qt.io
State Accepted, archived
Commit a93bbfa096cd7de8e935c6c2d2ad98d72a1c297f
Headers show
Series mesa: make sure GLES3 headers are installed | expand

Commit Message

Samuli Piippo March 8, 2022, 8:58 a.m. UTC
Since there is no libgles3-mesa package that would pull in the headers,
add dependency to libgles2-mesa-dev. Now there no need to manually add
GLES3 headers to image or toolchain.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/mesa/mesa.inc | 3 +++
 1 file changed, 3 insertions(+)

Comments

Quentin Schulz March 10, 2022, 10:16 a.m. UTC | #1
Hi Samuli,

On 3/8/22 09:58, Samuli Piippo wrote:
> Since there is no libgles3-mesa package that would pull in the headers,
> add dependency to libgles2-mesa-dev. Now there no need to manually add
> GLES3 headers to image or toolchain.
> 
> Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/mesa/mesa.inc | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index 2f79e8b34d..713a82dc7d 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -193,6 +193,9 @@ RDEPENDS:${PN}-dev = ""
>   # development package of libgles3.
>   RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
>   
> +# Add dependency so that GLES3 header don't need to be added manually
> +RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
> +

RDEPENDS:libgles2-mesa-dev += "libgles3-mesa-dev"

There is a new override syntax since Honister with colon (:) instead of 
underscore (_).

Also, this adds a circular dependency, I don't know how well the package 
managers handle this case (we have deb, opkg and rpm right now so all 
three of them need to be able to handle this circular dependency nicely).

Cheers,
Quentin

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 2f79e8b34d..713a82dc7d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -193,6 +193,9 @@  RDEPENDS:${PN}-dev = ""
 # development package of libgles3.
 RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
 
+# Add dependency so that GLES3 header don't need to be added manually
+RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
+
 PACKAGES =+ "libegl-mesa libegl-mesa-dev \
              libosmesa libosmesa-dev \
              libgl-mesa libgl-mesa-dev \