* [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0
@ 2024-08-15 11:56 Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Philipp Zabel @ 2024-08-15 11:56 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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>
---
rules/host-mesalib.make | 8 +++++++-
rules/mesalib.in | 10 +++++++---
rules/mesalib.make | 33 ++++++++++++++++++++-------------
3 files changed, 34 insertions(+), 17 deletions(-)
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
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe
2024-08-15 11:56 [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0 Philipp Zabel
@ 2024-08-15 11:56 ` 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] mesalib: version bump 24.1.4 -> 24.2.0 Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Philipp Zabel @ 2024-08-15 11:56 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
scripts/migrate/migrate_ptx | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 18f9a46529d5..dae0415cedab 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -493,3 +493,11 @@ s/^\(\(# \)\?PTXCONF_\)ATK_INTROSPECTION/\1AT_SPI2_CORE_INTROSPECTION/
# reason : switch to pcre2 in lighttpd
#
s/^\(\(# \)\?PTXCONF_LIGHTTPD_PCRE\)\>/\12/
+
+# from : ptxdist-2024.08.0
+# to : ptxdist-2024.09.0
+# symbol : MESALIB_DRI_SWRAST -> MESALIB_DRI_SOFTPIPE + MESALIB_DRI_LLVMPIPE
+# reason : mesalib 24.2 deconflated swrast/softpipe/llvmpipe
+#
+/^\(PTXCONF_MESALIB_DRI_\)SWRAST\([^_]*$\)/N
+s/^\(\(# \)\?PTXCONF_MESALIB_DRI_\)SWRAST\([^\n]*\n\)\(.*\)$/\1SOFTPIPE\3\1LLVMPIPE\3\4/
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 3/3] mesalib: read libgallium version from VERSION file
2024-08-15 11:56 [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0 Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
@ 2024-08-15 11:56 ` Philipp Zabel
2024-09-12 12:11 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-09-12 12:11 ` [ptxdist] [APPLIED] mesalib: version bump 24.1.4 -> 24.2.0 Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Philipp Zabel @ 2024-08-15 11:56 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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>
---
rules/mesalib.make | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/rules/mesalib.make b/rules/mesalib.make
index c62a0802f0a0..ca1fc6b992b8 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)
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: version bump 24.1.4 -> 24.2.0
2024-08-15 11:56 [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0 Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
2024-08-15 11:56 ` [ptxdist] [PATCH 3/3] mesalib: read libgallium version from VERSION file Philipp Zabel
@ 2024-09-12 12:11 ` Michael Olbrich
2 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2024-09-12 12:11 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] migrate: deconflate mesalib swrast/softpipe/lavapipe
2024-08-15 11:56 ` [ptxdist] [PATCH 2/3] migrate: deconflate mesalib swrast/softpipe/lavapipe Philipp Zabel
@ 2024-09-12 12:11 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2024-09-12 12:11 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as aa353ba7c5264901d7f7eb1dc71f4957b1990318.
Michael
[sent from post-receive hook]
On Thu, 12 Sep 2024 14:11:47 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240815115615.2745801-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index 18f9a46529d5..dae0415cedab 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -493,3 +493,11 @@ s/^\(\(# \)\?PTXCONF_\)ATK_INTROSPECTION/\1AT_SPI2_CORE_INTROSPECTION/
> # reason : switch to pcre2 in lighttpd
> #
> s/^\(\(# \)\?PTXCONF_LIGHTTPD_PCRE\)\>/\12/
> +
> +# from : ptxdist-2024.08.0
> +# to : ptxdist-2024.09.0
> +# symbol : MESALIB_DRI_SWRAST -> MESALIB_DRI_SOFTPIPE + MESALIB_DRI_LLVMPIPE
> +# reason : mesalib 24.2 deconflated swrast/softpipe/llvmpipe
> +#
> +/^\(PTXCONF_MESALIB_DRI_\)SWRAST\([^_]*$\)/N
> +s/^\(\(# \)\?PTXCONF_MESALIB_DRI_\)SWRAST\([^\n]*\n\)\(.*\)$/\1SOFTPIPE\3\1LLVMPIPE\3\4/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: read libgallium version from VERSION file
2024-08-15 11:56 ` [ptxdist] [PATCH 3/3] mesalib: read libgallium version from VERSION file Philipp Zabel
@ 2024-09-12 12:11 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2024-09-12 12:11 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-12 12:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-15 11:56 [ptxdist] [PATCH 1/3] mesalib: version bump 24.1.4 -> 24.2.0 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 ` [ptxdist] [APPLIED] mesalib: version bump 24.1.4 -> 24.2.0 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox