* [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1
@ 2021-05-20 14:06 Philipp Zabel
2021-05-21 11:29 ` Michael Olbrich
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Philipp Zabel @ 2021-05-20 14:06 UTC (permalink / raw)
To: ptxdist
- Make Vulkan layers configurable.
- The license file was modified trivially in commit 2f42c21221cf
("docs: Xorg -> X.Org")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/mesalib.in | 14 ++++++++++++++
rules/mesalib.make | 14 +++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 86981f8d3923..7c0b99f5a895 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -209,6 +209,20 @@ config MESALIB_VULKAN_SWRAST
select MESALIB_DRI_SWRAST
prompt "Software Rasterizer"
+comment "Vulkan layers"
+
+config MESALIB_VULKAN_DEVICE_SELECT
+ bool
+ prompt "Device select layer"
+
+config MESALIB_VULKAN_INTEL_NULLHW
+ bool
+ prompt "Intel nullhw layer"
+
+config MESALIB_VULKAN_OVERLAY
+ bool
+ prompt "Overlay layer"
+
config MESALIB_ZSTD
bool
prompt "use Zstandard for shader cache compression"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 5d8f3aad308d..f86da31f221a 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 21.0.3
-MESALIB_MD5 := 3331ef6d043768b4f3b33283a6dd44d8
+MESALIB_VERSION := 21.1.1
+MESALIB_MD5 := 69dc5839192f75991c5f5162d351587f
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
@@ -24,7 +24,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESALIB_LICENSE := MIT
MESALIB_LICENSE_FILES := \
- file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496
+ file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f
# ----------------------------------------------------------------------------
# Prepare
@@ -97,6 +97,10 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST) += swrast
MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y)))
+MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_DEVICE_SELECT) += device-select
+MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_INTEL_NULLHW) += intel-nullhw
+MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_OVERLAY) += overlay
+
MESALIB_LIBS-y := libglapi
MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM
@@ -114,6 +118,7 @@ MESALIB_CONF_OPT := \
-Dbuild-aco-tests=false \
-Dbuild-tests=false \
-Dd3d-drivers-path=/usr/lib/d3d \
+ -Ddraw-use-llvm=true \
-Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
-Ddri-drivers-path=/usr/lib/dri \
-Ddri-search-path=/usr/lib/dri \
@@ -169,10 +174,9 @@ MESALIB_CONF_OPT := \
-Dva-libs-path=/usr/lib/dri \
-Dvalgrind=disabled \
-Dvdpau-libs-path=/usr/lib/vdpau \
- -Dvulkan-device-select-layer=false \
-Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
- -Dvulkan-overlay-layer=false \
+ -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
-Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
-Dxvmc-libs-path=/usr/lib \
-Dzlib=enabled \
--
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] 3+ messages in thread
* Re: [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1
2021-05-20 14:06 [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1 Philipp Zabel
@ 2021-05-21 11:29 ` Michael Olbrich
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2021-05-21 11:29 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
On Thu, May 20, 2021 at 04:06:34PM +0200, Philipp Zabel wrote:
> - Make Vulkan layers configurable.
> - The license file was modified trivially in commit 2f42c21221cf
> ("docs: Xorg -> X.Org")
>
I need:
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 7c0b99f5a895..a21fde235ebc 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -206,6 +206,8 @@ config MESALIB_VULKAN_FREEDRENO
config MESALIB_VULKAN_SWRAST
bool
+ # needs LLVM
+ depends on BROKEN
select MESALIB_DRI_SWRAST
prompt "Software Rasterizer"
Otherwise building everything fails with:
../Mesa-21.1.1/meson.build:1648:2: ERROR: Problem encountered: The
following drivers require LLVM: Radv, RadeonSI, SWR, Lavapipe. One of these
is enabled, but LLVM is disabled.
I'll fix it locally while applying the patch.
Michael
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> rules/mesalib.in | 14 ++++++++++++++
> rules/mesalib.make | 14 +++++++++-----
> 2 files changed, 23 insertions(+), 5 deletions(-)
>
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index 86981f8d3923..7c0b99f5a895 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -209,6 +209,20 @@ config MESALIB_VULKAN_SWRAST
> select MESALIB_DRI_SWRAST
> prompt "Software Rasterizer"
>
> +comment "Vulkan layers"
> +
> +config MESALIB_VULKAN_DEVICE_SELECT
> + bool
> + prompt "Device select layer"
> +
> +config MESALIB_VULKAN_INTEL_NULLHW
> + bool
> + prompt "Intel nullhw layer"
> +
> +config MESALIB_VULKAN_OVERLAY
> + bool
> + prompt "Overlay layer"
> +
> config MESALIB_ZSTD
> bool
> prompt "use Zstandard for shader cache compression"
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 5d8f3aad308d..f86da31f221a 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 21.0.3
> -MESALIB_MD5 := 3331ef6d043768b4f3b33283a6dd44d8
> +MESALIB_VERSION := 21.1.1
> +MESALIB_MD5 := 69dc5839192f75991c5f5162d351587f
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
> @@ -24,7 +24,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
> MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
> MESALIB_LICENSE := MIT
> MESALIB_LICENSE_FILES := \
> - file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496
> + file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -97,6 +97,10 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST) += swrast
>
> MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y)))
>
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_DEVICE_SELECT) += device-select
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_INTEL_NULLHW) += intel-nullhw
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_OVERLAY) += overlay
> +
> MESALIB_LIBS-y := libglapi
> MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
> MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM
> @@ -114,6 +118,7 @@ MESALIB_CONF_OPT := \
> -Dbuild-aco-tests=false \
> -Dbuild-tests=false \
> -Dd3d-drivers-path=/usr/lib/d3d \
> + -Ddraw-use-llvm=true \
> -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
> -Ddri-drivers-path=/usr/lib/dri \
> -Ddri-search-path=/usr/lib/dri \
> @@ -169,10 +174,9 @@ MESALIB_CONF_OPT := \
> -Dva-libs-path=/usr/lib/dri \
> -Dvalgrind=disabled \
> -Dvdpau-libs-path=/usr/lib/vdpau \
> - -Dvulkan-device-select-layer=false \
> -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
> -Dvulkan-icd-dir=/etc/vulkan/icd.d \
> - -Dvulkan-overlay-layer=false \
> + -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
> -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
> -Dxvmc-libs-path=/usr/lib \
> -Dzlib=enabled \
> --
> 2.29.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
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 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [APPLIED] mesalib: version bump 21.0.3 -> 21.1.1
2021-05-20 14:06 [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1 Philipp Zabel
2021-05-21 11:29 ` Michael Olbrich
@ 2021-05-27 6:45 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2021-05-27 6:45 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 21d736ad3d7f2cc1b54226f04f0b89c3fd450067.
Michael
[sent from post-receive hook]
On Thu, 27 May 2021 08:45:55 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> - Make Vulkan layers configurable.
> - The license file was modified trivially in commit 2f42c21221cf
> ("docs: Xorg -> X.Org")
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20210520140634.27681-1-p.zabel@pengutronix.de>
> [mol: mark MESALIB_VULKAN_SWRAST as broken, it needs llvm]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index 86981f8d3923..a21fde235ebc 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -206,9 +206,25 @@ config MESALIB_VULKAN_FREEDRENO
>
> config MESALIB_VULKAN_SWRAST
> bool
> + # needs LLVM
> + depends on BROKEN
> select MESALIB_DRI_SWRAST
> prompt "Software Rasterizer"
>
> +comment "Vulkan layers"
> +
> +config MESALIB_VULKAN_DEVICE_SELECT
> + bool
> + prompt "Device select layer"
> +
> +config MESALIB_VULKAN_INTEL_NULLHW
> + bool
> + prompt "Intel nullhw layer"
> +
> +config MESALIB_VULKAN_OVERLAY
> + bool
> + prompt "Overlay layer"
> +
> config MESALIB_ZSTD
> bool
> prompt "use Zstandard for shader cache compression"
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 5d8f3aad308d..f86da31f221a 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 21.0.3
> -MESALIB_MD5 := 3331ef6d043768b4f3b33283a6dd44d8
> +MESALIB_VERSION := 21.1.1
> +MESALIB_MD5 := 69dc5839192f75991c5f5162d351587f
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
> @@ -24,7 +24,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
> MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
> MESALIB_LICENSE := MIT
> MESALIB_LICENSE_FILES := \
> - file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496
> + file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -97,6 +97,10 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST) += swrast
>
> MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y)))
>
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_DEVICE_SELECT) += device-select
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_INTEL_NULLHW) += intel-nullhw
> +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_OVERLAY) += overlay
> +
> MESALIB_LIBS-y := libglapi
> MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
> MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM
> @@ -114,6 +118,7 @@ MESALIB_CONF_OPT := \
> -Dbuild-aco-tests=false \
> -Dbuild-tests=false \
> -Dd3d-drivers-path=/usr/lib/d3d \
> + -Ddraw-use-llvm=true \
> -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
> -Ddri-drivers-path=/usr/lib/dri \
> -Ddri-search-path=/usr/lib/dri \
> @@ -169,10 +174,9 @@ MESALIB_CONF_OPT := \
> -Dva-libs-path=/usr/lib/dri \
> -Dvalgrind=disabled \
> -Dvdpau-libs-path=/usr/lib/vdpau \
> - -Dvulkan-device-select-layer=false \
> -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
> -Dvulkan-icd-dir=/etc/vulkan/icd.d \
> - -Dvulkan-overlay-layer=false \
> + -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \
> -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \
> -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] 3+ messages in thread
end of thread, other threads:[~2021-05-27 6:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-20 14:06 [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1 Philipp Zabel
2021-05-21 11:29 ` Michael Olbrich
2021-05-27 6:45 ` [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