* [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3
@ 2024-09-20 8:21 Philipp Zabel
2024-09-26 7:18 ` Michael Olbrich
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2024-09-20 8:21 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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, \
/usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl))
endif
--
2.39.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3
2024-09-20 8:21 [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3 Philipp Zabel
@ 2024-09-26 7:18 ` Michael Olbrich
2024-09-26 8:39 ` Philipp Zabel
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2024-09-26 7:18 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
On Fri, Sep 20, 2024 at 10:21:26AM +0200, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> 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 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3
2024-09-26 7:18 ` Michael Olbrich
@ 2024-09-26 8:39 ` Philipp Zabel
0 siblings, 0 replies; 4+ messages in thread
From: Philipp Zabel @ 2024-09-26 8:39 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On Do, 2024-09-26 at 09:18 +0200, Michael Olbrich wrote:
> On Fri, Sep 20, 2024 at 10:21:26AM +0200, Philipp Zabel wrote:
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> > 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.
In practice, only the PTXCONF_MESALIB_DRI_R600/RADEONSI/NOUVEAU options
enable VA drivers. All of them also enable a gallium driver that causes
libgallium to be installed.
regards
Philipp
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: version bump 24.2.2 -> 24.2.3
2024-09-20 8:21 [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3 Philipp Zabel
2024-09-26 7:18 ` Michael Olbrich
@ 2024-09-26 13:19 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-09-26 13:19 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as b6e32ed4053629cc82252a2a757f76e137103251.
Michael
[sent from post-receive hook]
On Thu, 26 Sep 2024 15:19:04 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240920082126.1593831-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 7149de96b1f4..15e6c7cb5d75 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, \
> /usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl))
> endif
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-26 13:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-20 8:21 [ptxdist] [PATCH v2] mesalib: version bump 24.2.2 -> 24.2.3 Philipp Zabel
2024-09-26 7:18 ` Michael Olbrich
2024-09-26 8:39 ` Philipp Zabel
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox