From: Ross Burton Date: Thu, 4 Sep 2025 14:03:35 +0000 (+0200) Subject: mesa: assign S in include file X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a77c0f5919fbef6e076d2b085f71c8bbbfc9188a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git mesa: assign S in include file Anything including mesa.inc will have the sources extracted in ${UNPACKDIR}/mesa-${PV}. The default for S is ${UNPACKDIR}/${BP}. ${BP} is ${BPN}-${PV}. Because mesa.bb is named mesa, BPN will be mesa and thus S wasn't required for mesa.bb but only for mesa-gl.bb. This also explains why this change is fine for mesa.bb as the value of S won't have changed, the ${BPN} part is now just hardcoded to "mesa" for mesa.bb instead. No intended change in behavior. Signed-off-by: Ross Burton [added commit log and title] Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov Signed-off-by: Quentin Schulz Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/mesa/mesa-gl.bb b/meta/recipes-graphics/mesa/mesa-gl.bb index 4d71406b6d..7b283415dd 100644 --- a/meta/recipes-graphics/mesa/mesa-gl.bb +++ b/meta/recipes-graphics/mesa/mesa-gl.bb @@ -4,8 +4,6 @@ SUMMARY += " (OpenGL only, no EGL/GLES)" PROVIDES = "virtual/libgl virtual/mesa" -S = "${UNPACKDIR}/mesa-${PV}" - TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" # At least one DRI rendering engine is required to build mesa. diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 4c079fe0ab..45499f6c42 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -24,6 +24,8 @@ PV = "25.2.0" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" +S = "${UNPACKDIR}/mesa-${PV}" + #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install:append() {