From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] mesalib: version bump 24.1.4 -> 24.2.0
Date: Thu, 12 Sep 2024 14:11:46 +0200 [thread overview]
Message-ID: <20240912121146.2685967-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20240815115615.2745801-1-p.zabel@pengutronix.de>
Thanks, applied as 219464d3b823eacd09b76bc4eafd0a0fc0118020.
Michael
[sent from post-receive hook]
On Thu, 12 Sep 2024 14:11:46 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://docs.mesa3d.org/relnotes/24.2.0.html
>
> The swrast Gallium driver option was split into softpipe and llvmpipe
> in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27607.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115615.2745801-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> index e343438612c9..ac72ebeac16d 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -19,6 +19,7 @@ HOST_MESALIB_CONF_TOOL := meson
> HOST_MESALIB_CONF_OPT := \
> $(HOST_MESON_OPT) \
> -Dallow-kcmp=enabled \
> + -Damd-use-llvm=false \
> -Dandroid-libbacktrace=disabled \
> -Dandroid-strict=true \
> -Dandroid-stub=false \
> @@ -42,7 +43,7 @@ HOST_MESALIB_CONF_OPT := \
> -Dgallium-d3d10umd=false \
> -Dgallium-d3d12-graphics=disabled \
> -Dgallium-d3d12-video=disabled \
> - -Dgallium-drivers=swrast \
> + -Dgallium-drivers=softpipe \
> -Dgallium-extra-hud=false \
> -Dgallium-nine=false \
> -Dgallium-omx=disabled \
> @@ -63,6 +64,8 @@ HOST_MESALIB_CONF_OPT := \
> -Dglx-direct=false \
> -Dglx-read-only-text=false \
> -Dgpuvis=false \
> + -Dhtml-docs=disabled \
> + -Dhtml-docs-path= \
> -Dimagination-srv=false \
> -Dinstall-intel-clc=$(call ptx/truefalse, PTXCONF_HOST_MESALIB_INTEL_CLC) \
> -Dinstall-intel-gpu-tests=false \
> @@ -70,6 +73,7 @@ HOST_MESALIB_CONF_OPT := \
> -Dintel-rt=disabled \
> -Dlibunwind=disabled \
> -Dllvm=$(call ptx/endis, PTXCONF_HOST_MESALIB_INTEL_CLC)d \
> + -Dllvm-orcjit=false \
> -Dlmsensors=disabled \
> -Dmicrosoft-clc=disabled \
> -Dmin-windows-version=8 \
> @@ -90,10 +94,12 @@ HOST_MESALIB_CONF_OPT := \
> -Dshared-glapi=enabled \
> -Dshared-llvm=disabled \
> -Dspirv-to-dxil=false \
> + -Dsplit-debug=disabled \
> -Dsse2=true \
> -Dstatic-libclc=[] \
> -Dteflon=false \
> -Dtools=glsl \
> + -Dunversion-libgallium=false \
> -Dva-libs-path=/usr/lib/dri \
> -Dvalgrind=disabled \
> -Dvdpau-libs-path=/usr/lib/vdpau \
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index dfab3381a1ec..853d2879e616 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -59,10 +59,14 @@ config MESALIB_LLVM
>
> comment "Drivers"
>
> -config MESALIB_DRI_SWRAST
> +config MESALIB_DRI_SOFTPIPE
> + bool
> + prompt "Software Rasterizer (softpipe)"
> +
> +config MESALIB_DRI_LLVMPIPE
> bool
> select MESALIB_LLVM
> - prompt "Software Rasterizer"
> + prompt "Software Rasterizer (llvmpipe)"
>
> config MESALIB_DRI_R300
> bool
> @@ -280,7 +284,7 @@ config MESALIB_VULKAN_PANFROST
>
> config MESALIB_VULKAN_SWRAST
> bool
> - select MESALIB_DRI_SWRAST
> + select MESALIB_DRI_LLVMPIPE
> prompt "Software Rasterizer"
>
> config MESALIB_VULKAN_VIRTIO
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index ddbb123a9ad9..c62a0802f0a0 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 24.1.4
> -MESALIB_MD5 := 04c50eb31359884fba2172bfa181abee
> +MESALIB_VERSION := 24.2.0
> +MESALIB_MD5 := 6c2108ec2a6ba4d9d1192a12256b0d3c
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
> @@ -45,7 +45,8 @@ ifdef PTXCONF_ARCH_ARM_NEON
> MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_V3D) += v3d
> MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4) += vc4
> endif
> -MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST) += swrast
> +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SOFTPIPE) += softpipe
> +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_LLVMPIPE) += llvmpipe
> MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_PANFROST) += panfrost
> MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_LIMA) += lima
> ifdef PTXCONF_ARCH_X86
> @@ -85,12 +86,13 @@ MESALIB_DRI_GALLIUM_LIBS-y = \
> st7735r \
> stm \
> sun4i-drm) \
> - $(subst swrast,swrast kms_swrast \
> + $(patsubst %pipe,swrast kms_swrast \
> + ,$(subst softpipe llvmpipe,softpipe \
> ,$(subst freedreno,kgsl msm \
> ,$(subst svga,vmwgfx \
> ,$(subst virgl,virtio_gpu \
> ,$(MESALIB_GALLIUM_DRIVERS-y) \
> - ))))
> + )))))
>
> MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC) += vc1dec
> MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC) += h264dec
> @@ -147,6 +149,7 @@ MESALIB_CONF_TOOL := meson
> MESALIB_CONF_OPT := \
> $(CROSS_MESON_USR) \
> -Dallow-kcmp=enabled \
> + -Damd-use-llvm=true \
> -Dandroid-libbacktrace=disabled \
> -Dandroid-strict=true \
> -Dandroid-stub=false \
> @@ -191,6 +194,8 @@ MESALIB_CONF_OPT := \
> -Dglx-direct=true \
> -Dglx-read-only-text=false \
> -Dgpuvis=false \
> + -Dhtml-docs=disabled \
> + -Dhtml-docs-path= \
> -Dimagination-srv=false \
> -Dinstall-intel-clc=false \
> -Dinstall-intel-gpu-tests=false \
> @@ -198,6 +203,7 @@ MESALIB_CONF_OPT := \
> -Dintel-rt=disabled \
> -Dlibunwind=disabled \
> -Dllvm=$(call ptx/endis, PTXCONF_MESALIB_LLVM)d \
> + -Dllvm-orcjit=false \
> -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
> -Dmicrosoft-clc=disabled \
> -Dmin-windows-version=8 \
> @@ -218,10 +224,12 @@ MESALIB_CONF_OPT := \
> -Dshared-glapi=enabled \
> -Dshared-llvm=enabled \
> -Dspirv-to-dxil=false \
> + -Dsplit-debug=disabled \
> -Dsse2=true \
> -Dstatic-libclc=[] \
> -Dteflon=$(call ptx/truefalse, PTXCONF_MESALIB_TEFLON) \
> -Dtools=[] \
> + -Dunversion-libgallium=false \
> -Dva-libs-path=/usr/lib/dri \
> -Dvalgrind=disabled \
> -Dvdpau-libs-path=/usr/lib/vdpau \
> @@ -269,25 +277,24 @@ $(STATEDIR)/mesalib.targetinstall:
> @$(call install_fixup, mesalib,DESCRIPTION,missing)
>
> ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
> - @$(call install_copy, mesalib, 0, 0, 0644, \
> - $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
> - /usr/lib/dri/gallium_dri.so)
> + @$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libgallium-$(MESALIB_VERSION).so)
> +ifdef PTXCONF_MESALIB_EGL_X11
> + @$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/libdril_dri.so)
>
> @$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \
> test -f $(MESALIB_PKGDIR)/usr/lib/dri/$(lib)_dri.so || \
> ptxd_bailout "missing gallium driver $(lib)_dri.so"$(ptx/nl) \
> - $(call install_link, mesalib, gallium_dri.so, \
> + $(call install_link, mesalib, libdril_dri.so, \
> /usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
> endif
> +endif
> ifneq ($(strip $(MESALIB_DRI_VA_LIBS-y)),)
> - @$(call install_copy, mesalib, 0, 0, 0644, \
> - $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_VA_LIBS-y))_drv_video.so, \
> - /usr/lib/dri/va_dri.so)
> + @$(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, va_dri.so, \
> + $(call install_link, mesalib, libgallium_drv_video.so, \
> /usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl))
> endif
>
prev parent reply other threads:[~2024-09-12 12:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-15 11:56 [ptxdist] [PATCH 1/3] " Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
2024-09-12 12:11 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-15 11:56 ` [ptxdist] [PATCH 3/3] mesalib: read libgallium version from VERSION file Philipp Zabel
2024-09-12 12:11 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-09-12 12:11 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240912121146.2685967-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox