From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Tue, 30 Mar 2021 11:48:32 +0200 From: Michael Olbrich Message-ID: <20210330094832.GB4162561@pengutronix.de> References: <20210325122712.22641-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210325122712.22641-1-p.zabel@pengutronix.de> Subject: Re: [ptxdist] [PATCH] mesalib: version bump 20.3.3 -> 21.0.1 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: Philipp Zabel Cc: ptxdist@pengutronix.de On Thu, Mar 25, 2021 at 01:27:12PM +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel Fails to build here: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:123: undefined reference to `xcb_randr_query_version_unchecked' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:125: undefined reference to `xcb_randr_query_version_reply' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:137: undefined reference to `xcb_randr_get_screen_resources_current_unchecked' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:139: undefined reference to `xcb_randr_get_screen_resources_current_reply' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:147: undefined reference to `xcb_randr_get_screen_resources_current_outputs' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:149: undefined reference to `xcb_randr_get_output_info' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:153: undefined reference to `xcb_randr_get_output_info_reply' .../arm-v7a-linux-gnueabihf/bin/ld: .../Mesa-21.0.1-build/../Mesa-21.0.1/src/vulkan/wsi/wsi_common_x11.c:158: undefined reference to `xcb_randr_get_output_info_name' >From a quick look, the dependency on xcb_randr is only added for -Dxlib-lease=enabled. We should probably enable this together. Michael > --- > rules/host-mesalib.make | 9 ++++++++- > rules/mesalib.make | 13 ++++++++++--- > 2 files changed, 18 insertions(+), 4 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.make b/rules/mesalib.make > index f223ae8768b2..94a18f3b8b49 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=[] \ > @@ -169,6 +175,7 @@ MESALIB_CONF_OPT := \ > -Dvulkan-overlay-layer=false \ > -Dxlib-lease=disabled \ > -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 > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de