On Fri, Sep 20, 2024 at 10:21:26AM +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel <[email protected]> > --- > v2: don't install libgallium_drv_video.so, link VA drivers to > ../libgallium-24.2.3.so > --- > rules/mesalib.make | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index c18056a97db7..379bbdf1173c 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 24.2.2 > -MESALIB_MD5 := 2efcf055c7d48b12cd2c9df2fc41f1b0 > +MESALIB_VERSION := 24.2.3 > +MESALIB_MD5 := e3a195842c5cfbfb7234ed45f70af787 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \ > @@ -294,12 +294,10 @@ ifdef PTXCONF_MESALIB_EGL_X11 > endif > endif > ifneq ($(strip $(MESALIB_DRI_VA_LIBS-y)),) > - @$(call install_copy, mesalib, 0, 0, 0644, -, > /usr/lib/dri/libgallium_drv_video.so) > - > @$(foreach lib, $(MESALIB_DRI_VA_LIBS-y), \ > test -f $(MESALIB_PKGDIR)/usr/lib/dri/$(lib)_drv_video.so || \ > ptxd_bailout "missing va driver > $(lib)_drv_video.so"$(ptx/nl) \ > - $(call install_link, mesalib, libgallium_drv_video.so, \ > + $(call install_link, mesalib, > ../libgallium-$(MESALIB_LIBGALLIUM_VERSION).so, \
I'm pretty sure that this is not quite correct. _If_ libgallium-$(MESALIB_LIBGALLIUM_VERSION).so ist installed, then this works. But if it is not built, then libgallium_drv_video.so is still created and used. At least, that's what the upstream commit suggests. Michael > /usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl)) > endif > > -- > 2.39.5 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
