* [ptxdist] [PATCH 1/3] host-mesalib: sync build options
@ 2021-07-30 14:31 Philipp Zabel
2021-07-30 14:31 ` [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6 Philipp Zabel
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Philipp Zabel @ 2021-07-30 14:31 UTC (permalink / raw)
To: ptxdist
A few host-mesalib build options haven't been kept up to date.
Synchronize current options from the target recipe.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/host-mesalib.make | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index a9b5f6fd1a1a..ba8177aeafbd 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -22,6 +22,7 @@ HOST_MESALIB_CONF_OPT := \
-Dbuild-aco-tests=false \
-Dbuild-tests=false \
-Dd3d-drivers-path=/usr/lib/d3d \
+ -Ddraw-use-llvm=false \
-Ddri-drivers= \
-Ddri-drivers-path=/usr/lib/dri \
-Ddri-search-path=/usr/lib/dri \
@@ -42,8 +43,8 @@ HOST_MESALIB_CONF_OPT := \
-Dgles-lib-suffix= \
-Dgles1=disabled \
-Dgles2=disabled \
- -Dglvnd-name= \
-Dglvnd=false \
+ -Dglvnd-vendor-name= \
-Dglx=disabled \
-Dglx-direct=false \
-Dglx-read-only-text=false \
@@ -63,9 +64,9 @@ HOST_MESALIB_CONF_OPT := \
-Dpower8=disabled \
-Dprefer-iris=true \
-Dselinux=false \
- -Dshader-cache-default=true \
-Dshader-cache=disabled \
- -Dshader-max-cache-size=1G \
+ -Dshader-cache-default=true \
+ -Dshader-cache-max-size=1G \
-Dshared-glapi=enabled \
-Dshared-llvm=disabled \
-Dshared-swr=true \
@@ -77,10 +78,9 @@ HOST_MESALIB_CONF_OPT := \
-Dva-libs-path=/usr/lib/dri \
-Dvalgrind=disabled \
-Dvdpau-libs-path=/usr/lib/vdpau \
- -Dvulkan-device-select-layer=false \
-Dvulkan-drivers=[] \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
- -Dvulkan-overlay-layer=false \
+ -Dvulkan-layers=[] \
-Dxlib-lease=disabled \
-Dxvmc-libs-path=/usr/lib \
-Dzlib=enabled \
--
2.30.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] 6+ messages in thread
* [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6
2021-07-30 14:31 [ptxdist] [PATCH 1/3] host-mesalib: sync build options Philipp Zabel
@ 2021-07-30 14:31 ` Philipp Zabel
2021-08-04 6:14 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-07-30 14:31 ` [ptxdist] [PATCH 3/3] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11 Philipp Zabel
2021-08-04 6:14 ` [ptxdist] [APPLIED] host-mesalib: sync build options Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Philipp Zabel @ 2021-07-30 14:31 UTC (permalink / raw)
To: ptxdist
-Degl-native-platform=auto continues to use the first entry from the
-Dplatforms option as window system for EGL_DEFAULT_DISPLAY.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/host-mesalib.make | 1 +
rules/mesalib.make | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index ba8177aeafbd..95794c4c99bd 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -29,6 +29,7 @@ HOST_MESALIB_CONF_OPT := \
-Ddri3=disabled \
-Degl=disabled \
-Degl-lib-suffix= \
+ -Degl-native-platform=auto \
-Dfreedreno-kgsl=false \
-Dgallium-drivers= \
-Dgallium-extra-hud=false \
diff --git a/rules/mesalib.make b/rules/mesalib.make
index acf26b1ad544..0990cd190b06 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 21.1.3
-MESALIB_MD5 := 0d6e96ca75cf8decc6f8a8a75c729ab9
+MESALIB_VERSION := 21.1.6
+MESALIB_MD5 := 115a4b7383982f03b2aa5b91d1a8a259
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -125,6 +125,7 @@ MESALIB_CONF_OPT := \
-Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
-Degl-lib-suffix= \
+ -Degl-native-platform=auto \
-Dfreedreno-kgsl=false \
-Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
-Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \
--
2.30.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] 6+ messages in thread
* [ptxdist] [PATCH 3/3] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11
2021-07-30 14:31 [ptxdist] [PATCH 1/3] host-mesalib: sync build options Philipp Zabel
2021-07-30 14:31 ` [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6 Philipp Zabel
@ 2021-07-30 14:31 ` Philipp Zabel
2021-08-04 6:14 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-08-04 6:14 ` [ptxdist] [APPLIED] host-mesalib: sync build options Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Philipp Zabel @ 2021-07-30 14:31 UTC (permalink / raw)
To: ptxdist
If both wayland and x11 EGL platforms are enabled, let EGL assume
wayland for EGL_DEFAULT_DISPLAY, instead of x11.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/mesalib.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 0990cd190b06..574e95bf4e37 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -108,8 +108,8 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2
MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL
MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm
-MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland
+MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
MESALIB_CONF_TOOL := meson
MESALIB_CONF_OPT := \
--
2.30.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] 6+ messages in thread
* Re: [ptxdist] [APPLIED] host-mesalib: sync build options
2021-07-30 14:31 [ptxdist] [PATCH 1/3] host-mesalib: sync build options Philipp Zabel
2021-07-30 14:31 ` [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6 Philipp Zabel
2021-07-30 14:31 ` [ptxdist] [PATCH 3/3] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11 Philipp Zabel
@ 2021-08-04 6:14 ` Michael Olbrich
2 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-08-04 6:14 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 6c15e2521fac07e0771f2407fa66cadd0c312c18.
Michael
[sent from post-receive hook]
On Wed, 04 Aug 2021 08:14:12 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> A few host-mesalib build options haven't been kept up to date.
> Synchronize current options from the target recipe.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210730143138.9696-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 a9b5f6fd1a1a..ba8177aeafbd 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -22,6 +22,7 @@ HOST_MESALIB_CONF_OPT := \
> -Dbuild-aco-tests=false \
> -Dbuild-tests=false \
> -Dd3d-drivers-path=/usr/lib/d3d \
> + -Ddraw-use-llvm=false \
> -Ddri-drivers= \
> -Ddri-drivers-path=/usr/lib/dri \
> -Ddri-search-path=/usr/lib/dri \
> @@ -42,8 +43,8 @@ HOST_MESALIB_CONF_OPT := \
> -Dgles-lib-suffix= \
> -Dgles1=disabled \
> -Dgles2=disabled \
> - -Dglvnd-name= \
> -Dglvnd=false \
> + -Dglvnd-vendor-name= \
> -Dglx=disabled \
> -Dglx-direct=false \
> -Dglx-read-only-text=false \
> @@ -63,9 +64,9 @@ HOST_MESALIB_CONF_OPT := \
> -Dpower8=disabled \
> -Dprefer-iris=true \
> -Dselinux=false \
> - -Dshader-cache-default=true \
> -Dshader-cache=disabled \
> - -Dshader-max-cache-size=1G \
> + -Dshader-cache-default=true \
> + -Dshader-cache-max-size=1G \
> -Dshared-glapi=enabled \
> -Dshared-llvm=disabled \
> -Dshared-swr=true \
> @@ -77,10 +78,9 @@ HOST_MESALIB_CONF_OPT := \
> -Dva-libs-path=/usr/lib/dri \
> -Dvalgrind=disabled \
> -Dvdpau-libs-path=/usr/lib/vdpau \
> - -Dvulkan-device-select-layer=false \
> -Dvulkan-drivers=[] \
> -Dvulkan-icd-dir=/etc/vulkan/icd.d \
> - -Dvulkan-overlay-layer=false \
> + -Dvulkan-layers=[] \
> -Dxlib-lease=disabled \
> -Dxvmc-libs-path=/usr/lib \
> -Dzlib=enabled \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: version bump 21.1.3 -> 21.1.6
2021-07-30 14:31 ` [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6 Philipp Zabel
@ 2021-08-04 6:14 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-08-04 6:14 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 077626f2add138836f2d2dac7d7195fdc1f253b7.
Michael
[sent from post-receive hook]
On Wed, 04 Aug 2021 08:14:13 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> -Degl-native-platform=auto continues to use the first entry from the
> -Dplatforms option as window system for EGL_DEFAULT_DISPLAY.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210730143138.9696-2-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 ba8177aeafbd..95794c4c99bd 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -29,6 +29,7 @@ HOST_MESALIB_CONF_OPT := \
> -Ddri3=disabled \
> -Degl=disabled \
> -Degl-lib-suffix= \
> + -Degl-native-platform=auto \
> -Dfreedreno-kgsl=false \
> -Dgallium-drivers= \
> -Dgallium-extra-hud=false \
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 3ff3a09bd2f3..043d0d7599b5 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 21.1.3
> -MESALIB_MD5 := 0d6e96ca75cf8decc6f8a8a75c729ab9
> +MESALIB_VERSION := 21.1.6
> +MESALIB_MD5 := 115a4b7383982f03b2aa5b91d1a8a259
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
> @@ -125,6 +125,7 @@ MESALIB_CONF_OPT := \
> -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \
> -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
> -Degl-lib-suffix= \
> + -Degl-native-platform=auto \
> -Dfreedreno-kgsl=false \
> -Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
> -Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11
2021-07-30 14:31 ` [ptxdist] [PATCH 3/3] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11 Philipp Zabel
@ 2021-08-04 6:14 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-08-04 6:14 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 29853070096778a1e10635014ebbbd6699f96890.
Michael
[sent from post-receive hook]
On Wed, 04 Aug 2021 08:14:14 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> If both wayland and x11 EGL platforms are enabled, let EGL assume
> wayland for EGL_DEFAULT_DISPLAY, instead of x11.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210730143138.9696-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 043d0d7599b5..fb3b5be02578 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -108,8 +108,8 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2
> MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL
> MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm
>
> -MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
> MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland
> +MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11
>
> MESALIB_CONF_TOOL := meson
> MESALIB_CONF_OPT := \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-04 6:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-30 14:31 [ptxdist] [PATCH 1/3] host-mesalib: sync build options Philipp Zabel
2021-07-30 14:31 ` [ptxdist] [PATCH 2/3] mesalib: version bump 21.1.3 -> 21.1.6 Philipp Zabel
2021-08-04 6:14 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-07-30 14:31 ` [ptxdist] [PATCH 3/3] mesalib: let EGL_DEFAULT_DISPLAY prefer wayland over x11 Philipp Zabel
2021-08-04 6:14 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-08-04 6:14 ` [ptxdist] [APPLIED] host-mesalib: sync build options Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox