* [ptxdist] [PATCH v2] mesalib: version bump 20.3.3 -> 21.0.1
@ 2021-04-01 8:46 Philipp Zabel
2021-04-09 13:33 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2021-04-01 8:46 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changes since v1:
- Enable -Dxlib-lease together with -Dplatform=x11, to work around
a missing dependency on xcb-xrandr in the Vulkan X11 WSI:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9972
- Add Xrandr dependency
---
rules/host-mesalib.make | 9 ++++++++-
rules/mesalib.in | 1 +
rules/mesalib.make | 15 +++++++++++----
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index fb2d2b18b3ad..a9b5f6fd1a1a 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -42,6 +42,7 @@ HOST_MESALIB_CONF_OPT := \
-Dgles-lib-suffix= \
-Dgles1=disabled \
-Dgles2=disabled \
+ -Dglvnd-name= \
-Dglvnd=false \
-Dglx=disabled \
-Dglx-direct=false \
@@ -50,10 +51,12 @@ HOST_MESALIB_CONF_OPT := \
-Dlibunwind=disabled \
-Dllvm=disabled \
-Dlmsensors=disabled \
+ -Dmicrosoft-clc=disabled \
-Domx-libs-path=/usr/lib/dri \
+ -Dopencl-native=false \
-Dopencl-spirv=false \
-Dopengl=true \
- -Dosmesa=none \
+ -Dosmesa=false \
-Dosmesa-bits=8 \
-Dplatform-sdk-version=25 \
-Dplatforms= \
@@ -62,9 +65,12 @@ HOST_MESALIB_CONF_OPT := \
-Dselinux=false \
-Dshader-cache-default=true \
-Dshader-cache=disabled \
+ -Dshader-max-cache-size=1G \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
-Dshared-swr=true \
+ -Dspirv-to-dxil=false \
+ -Dsse2=true \
-Dstatic-libclc=[] \
-Dswr-arches=[] \
-Dtools=glsl \
@@ -77,6 +83,7 @@ HOST_MESALIB_CONF_OPT := \
-Dvulkan-overlay-layer=false \
-Dxlib-lease=disabled \
-Dxvmc-libs-path=/usr/lib \
+ -Dzlib=enabled \
-Dzstd=disabled
HOST_MESALIB_MAKE_OPT := \
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 09eb6fa37de8..86981f8d3923 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -27,6 +27,7 @@ menuconfig MESALIB
select XORG_LIB_XXF86VM if MESALIB_GLX
select XORG_LIB_XDAMAGE if MESALIB_GLX
select XORG_LIB_XFIXES if MESALIB_GLX
+ select XORG_LIB_XRANDR if MESALIB_EGL_X11
select XORG_LIB_XSHMFENCE if MESALIB_DRI3
select EXPAT
select ZLIB
diff --git a/rules/mesalib.make b/rules/mesalib.make
index f223ae8768b2..fb44fe1028b0 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 20.3.3
-MESALIB_MD5 := c4c81cbd8a93f87104d3f1209948b238
+MESALIB_VERSION := 21.0.1
+MESALIB_MD5 := b7376187ef42cb40c9f914c48dfc07b4
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -134,6 +134,7 @@ MESALIB_CONF_OPT := \
-Dgles-lib-suffix= \
-Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \
-Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \
+ -Dglvnd-name= \
-Dglvnd=false \
-Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
-Dglx-direct=true \
@@ -142,10 +143,12 @@ MESALIB_CONF_OPT := \
-Dlibunwind=disabled \
-Dllvm=disabled \
-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
+ -Dmicrosoft-clc=disabled \
-Domx-libs-path=/usr/lib/dri \
+ -Dopencl-native=false \
-Dopencl-spirv=false \
-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
- -Dosmesa=none \
+ -Dosmesa=false \
-Dosmesa-bits=8 \
-Dplatform-sdk-version=25 \
-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
@@ -154,9 +157,12 @@ MESALIB_CONF_OPT := \
-Dselinux=false \
-Dshader-cache-default=true \
-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \
+ -Dshader-max-cache-size=1G \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
-Dshared-swr=true \
+ -Dspirv-to-dxil=false \
+ -Dsse2=true \
-Dstatic-libclc=[] \
-Dswr-arches=[] \
-Dtools=[] \
@@ -167,8 +173,9 @@ MESALIB_CONF_OPT := \
-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
-Dvulkan-overlay-layer=false \
- -Dxlib-lease=disabled \
+ -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
-Dxvmc-libs-path=/usr/lib \
+ -Dzlib=enabled \
-Dzstd=$(call ptx/endis, PTXCONF_MESALIB_ZSTD)d
# ----------------------------------------------------------------------------
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: version bump 20.3.3 -> 21.0.1
2021-04-01 8:46 [ptxdist] [PATCH v2] mesalib: version bump 20.3.3 -> 21.0.1 Philipp Zabel
@ 2021-04-09 13:33 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-04-09 13:33 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 97981367fe855c1a2a03a910917ab8929cde882e.
Michael
[sent from post-receive hook]
On Fri, 09 Apr 2021 15:33:19 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210401084612.17279-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 fb2d2b18b3ad..a9b5f6fd1a1a 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -42,6 +42,7 @@ HOST_MESALIB_CONF_OPT := \
> -Dgles-lib-suffix= \
> -Dgles1=disabled \
> -Dgles2=disabled \
> + -Dglvnd-name= \
> -Dglvnd=false \
> -Dglx=disabled \
> -Dglx-direct=false \
> @@ -50,10 +51,12 @@ HOST_MESALIB_CONF_OPT := \
> -Dlibunwind=disabled \
> -Dllvm=disabled \
> -Dlmsensors=disabled \
> + -Dmicrosoft-clc=disabled \
> -Domx-libs-path=/usr/lib/dri \
> + -Dopencl-native=false \
> -Dopencl-spirv=false \
> -Dopengl=true \
> - -Dosmesa=none \
> + -Dosmesa=false \
> -Dosmesa-bits=8 \
> -Dplatform-sdk-version=25 \
> -Dplatforms= \
> @@ -62,9 +65,12 @@ HOST_MESALIB_CONF_OPT := \
> -Dselinux=false \
> -Dshader-cache-default=true \
> -Dshader-cache=disabled \
> + -Dshader-max-cache-size=1G \
> -Dshared-glapi=enabled \
> -Dshared-llvm=disabled \
> -Dshared-swr=true \
> + -Dspirv-to-dxil=false \
> + -Dsse2=true \
> -Dstatic-libclc=[] \
> -Dswr-arches=[] \
> -Dtools=glsl \
> @@ -77,6 +83,7 @@ HOST_MESALIB_CONF_OPT := \
> -Dvulkan-overlay-layer=false \
> -Dxlib-lease=disabled \
> -Dxvmc-libs-path=/usr/lib \
> + -Dzlib=enabled \
> -Dzstd=disabled
>
> HOST_MESALIB_MAKE_OPT := \
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index 09eb6fa37de8..86981f8d3923 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -27,6 +27,7 @@ menuconfig MESALIB
> select XORG_LIB_XXF86VM if MESALIB_GLX
> select XORG_LIB_XDAMAGE if MESALIB_GLX
> select XORG_LIB_XFIXES if MESALIB_GLX
> + select XORG_LIB_XRANDR if MESALIB_EGL_X11
> select XORG_LIB_XSHMFENCE if MESALIB_DRI3
> select EXPAT
> select ZLIB
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index f223ae8768b2..fb44fe1028b0 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 20.3.3
> -MESALIB_MD5 := c4c81cbd8a93f87104d3f1209948b238
> +MESALIB_VERSION := 21.0.1
> +MESALIB_MD5 := b7376187ef42cb40c9f914c48dfc07b4
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
> @@ -134,6 +134,7 @@ MESALIB_CONF_OPT := \
> -Dgles-lib-suffix= \
> -Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \
> -Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \
> + -Dglvnd-name= \
> -Dglvnd=false \
> -Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
> -Dglx-direct=true \
> @@ -142,10 +143,12 @@ MESALIB_CONF_OPT := \
> -Dlibunwind=disabled \
> -Dllvm=disabled \
> -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
> + -Dmicrosoft-clc=disabled \
> -Domx-libs-path=/usr/lib/dri \
> + -Dopencl-native=false \
> -Dopencl-spirv=false \
> -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
> - -Dosmesa=none \
> + -Dosmesa=false \
> -Dosmesa-bits=8 \
> -Dplatform-sdk-version=25 \
> -Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
> @@ -154,9 +157,12 @@ MESALIB_CONF_OPT := \
> -Dselinux=false \
> -Dshader-cache-default=true \
> -Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \
> + -Dshader-max-cache-size=1G \
> -Dshared-glapi=enabled \
> -Dshared-llvm=disabled \
> -Dshared-swr=true \
> + -Dspirv-to-dxil=false \
> + -Dsse2=true \
> -Dstatic-libclc=[] \
> -Dswr-arches=[] \
> -Dtools=[] \
> @@ -167,8 +173,9 @@ MESALIB_CONF_OPT := \
> -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
> -Dvulkan-icd-dir=/etc/vulkan/icd.d \
> -Dvulkan-overlay-layer=false \
> - -Dxlib-lease=disabled \
> + -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
> -Dxvmc-libs-path=/usr/lib \
> + -Dzlib=enabled \
> -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_ZSTD)d
>
> # ----------------------------------------------------------------------------
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-09 13:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-01 8:46 [ptxdist] [PATCH v2] mesalib: version bump 20.3.3 -> 21.0.1 Philipp Zabel
2021-04-09 13:33 ` [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