From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 21 May 2021 13:30:03 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lk3Lv-0002vW-7O for lore@lore.pengutronix.de; Fri, 21 May 2021 13:30:03 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lk3Lu-0004gg-KN; Fri, 21 May 2021 13:30:02 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lk3LX-0004gP-Ay; Fri, 21 May 2021 13:29:39 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lk3LW-0002MQ-RM; Fri, 21 May 2021 13:29:38 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lk3LW-00BZsG-QE; Fri, 21 May 2021 13:29:38 +0200 Date: Fri, 21 May 2021 13:29:38 +0200 From: Michael Olbrich To: Philipp Zabel Message-ID: <20210521112938.GE3634306@pengutronix.de> Mail-Followup-To: Philipp Zabel , ptxdist@pengutronix.de References: <20210520140634.27681-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210520140634.27681-1-p.zabel@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH] mesalib: version bump 21.0.3 -> 21.1.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 > --- > 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