Re: [ptxdist] [APPLIED] mesalib: read libgallium version from VERSION file

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 45cad95eea9237cd9169d130eee9ea7b0d4ca4f4.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:47 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Use the version from the VERSION file to determine the libgallium file
> name. Fall back to using MESALIB_VERSION if the sources are not present.
> 
> When building from git, the VERSION file may contain a version in the
> form 24.3.0-devel, which is likely different from MESALIB_VERSION. The
> build system determines the libgallium file name from the VERSION file,
> so we should do the same.
> 
> This fixes targetinstall for git builds, e.g. when using local-src. For
> release tarballs, the VERSION file content and MESALIB_VERSION are
> identical.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115615.2745801-3-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index c62a0802f0a0..1ff184b1e732 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -267,6 +267,10 @@ $(STATEDIR)/mesalib.compile:
>  # Target-Install
>  # ----------------------------------------------------------------------------
>  
> +# read libgallium version from file, fall back to package version
> +MESALIB_LIBGALLIUM_VERSION = \
> +	$(if $(wildcard $(MESALIB_DIR)/VERSION),$(file <$(MESALIB_DIR)/VERSION),$(MESALIB_VERSION))
> +
>  $(STATEDIR)/mesalib.targetinstall:
>  	@$(call targetinfo)
>  
> @@ -277,7 +281,8 @@ $(STATEDIR)/mesalib.targetinstall:
>  	@$(call install_fixup, mesalib,DESCRIPTION,missing)
>  
>  ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
> -	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libgallium-$(MESALIB_VERSION).so)
> +	@$(call install_copy, mesalib, 0, 0, 0644, -, \
> +		/usr/lib/libgallium-$(MESALIB_LIBGALLIUM_VERSION).so)
>  ifdef PTXCONF_MESALIB_EGL_X11
>  	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/libdril_dri.so)
>