From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: In-Reply-To: <20201002133635.1031-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Message-Id: From: Michael Olbrich Date: Wed, 14 Oct 2020 12:30:50 +0200 Subject: Re: [ptxdist] [APPLIED] mesalib: version bump 20.1.9 -> 20.2.0 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: ptxdist@pengutronix.de Cc: Philipp Zabel Thanks, applied as c1a5865a62f523ba993f514664d0886ab09432fd. Michael [sent from post-receive hook] On Wed, 14 Oct 2020 12:30:50 +0200, Philipp Zabel wrote: > The license file has been converted from html to rst [1]. > For many options true/false is now deprecated in favor of > enabled/disabled [2]. > The EGL surfaceless platform is always enabled [3]. > > [1] commit 4d066836e3cf ("docs: convert articles to reructuredtext"). > [2] commit 138c003d2273 ("meson: deprecated 'true' and 'false' in combo options for 'enabled' and 'disabled'") > [3] commit a38e21d6683a ("egl: always compile surfaceless") > > Signed-off-by: Philipp Zabel > Message-Id: <20201002133635.1031-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make > index 6901159de61f..77244eb73bfa 100644 > --- a/rules/host-mesalib.make > +++ b/rules/host-mesalib.make > @@ -18,35 +18,37 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib > HOST_MESALIB_CONF_TOOL := meson > HOST_MESALIB_CONF_OPT := \ > $(HOST_MESON_OPT) \ > + -Dandroid-stub=false \ > + -Dbuild-aco-tests=false \ > -Dbuild-tests=false \ > -Dd3d-drivers-path=/usr/lib/d3d \ > -Ddri-drivers= \ > -Ddri-drivers-path=/usr/lib/dri \ > -Ddri-search-path=/usr/lib/dri \ > - -Ddri3=false \ > - -Degl=false \ > + -Ddri3=disabled \ > + -Degl=disabled \ > -Degl-lib-suffix= \ > -Dgallium-drivers= \ > -Dgallium-extra-hud=false \ > -Dgallium-nine=false \ > -Dgallium-omx=disabled \ > -Dgallium-opencl=disabled \ > - -Dgallium-va=false \ > - -Dgallium-vdpau=false \ > - -Dgallium-xa=false \ > - -Dgallium-xvmc=false \ > - -Dgbm=false \ > + -Dgallium-va=disabled \ > + -Dgallium-vdpau=disabled \ > + -Dgallium-xa=disabled \ > + -Dgallium-xvmc=disabled \ > + -Dgbm=disabled \ > -Dgles-lib-suffix= \ > - -Dgles1=false \ > - -Dgles2=false \ > + -Dgles1=disabled \ > + -Dgles2=disabled \ > -Dglvnd=false \ > -Dglx=disabled \ > -Dglx-direct=false \ > -Dglx-read-only-text=false \ > -Dinstall-intel-gpu-tests=false \ > - -Dlibunwind=false \ > - -Dllvm=false \ > - -Dlmsensors=false \ > + -Dlibunwind=disabled \ > + -Dllvm=disabled \ > + -Dlmsensors=disabled \ > -Domx-libs-path=/usr/lib/dri \ > -Dopencl-spirv=false \ > -Dopengl=true \ > @@ -54,24 +56,25 @@ HOST_MESALIB_CONF_OPT := \ > -Dosmesa-bits=8 \ > -Dplatform-sdk-version=25 \ > -Dplatforms= \ > - -Dpower8=false \ > + -Dpower8=disabled \ > -Dprefer-iris=true \ > -Dselinux=false \ > - -Dshader-cache=false \ > - -Dshared-glapi=true \ > - -Dshared-llvm=false \ > + -Dshader-cache=disabled \ > + -Dshared-glapi=enabled \ > + -Dshared-llvm=disabled \ > -Dshared-swr=true \ > -Dswr-arches=[] \ > -Dtools=glsl \ > -Dva-libs-path=/usr/lib/dri \ > - -Dvalgrind=false \ > + -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 \ > - -Dxlib-lease=false \ > + -Dxlib-lease=disabled \ > -Dxvmc-libs-path=/usr/lib \ > - -Dzstd=false > + -Dzstd=disabled > > HOST_MESALIB_MAKE_OPT := \ > src/compiler/glsl/glsl_compiler > diff --git a/rules/mesalib.in b/rules/mesalib.in > index df0da381c11d..ccf218dab5a3 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -101,8 +101,6 @@ config MESALIB_DRI_ETNAVIV > > config MESALIB_DRI_V3D > bool > - # needs v3dv3 > - depends on BROKEN > prompt "v3d" > > config MESALIB_DRI_VC4 > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 40d0057792d0..1e9a004d1885 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 20.1.9 > -MESALIB_MD5 := a29ff0d65a067ffaf08e4c48fd6d2d03 > +MESALIB_VERSION := 20.2.0 > +MESALIB_MD5 := 83c023d4fd73d69767cf40c5f5ff43de > 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.html;md5=c1843d93c460bbf778d6037ce324f9f7 > + file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -83,43 +83,43 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GLES2) += libGLESv2 > MESALIB_LIBS-$(PTXCONF_MESALIB_EGL) += libEGL > MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm > > -MESALIBS_EGL_PLATFORMS-y := surfaceless > MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11 > -MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_DRM) += drm > MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland > > MESALIB_CONF_TOOL := meson > MESALIB_CONF_OPT := \ > $(CROSS_MESON_USR) \ > + -Dandroid-stub=false \ > + -Dbuild-aco-tests=false \ > -Dbuild-tests=false \ > -Dd3d-drivers-path=/usr/lib/d3d \ > -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \ > -Ddri-drivers-path=/usr/lib/dri \ > -Ddri-search-path=/usr/lib/dri \ > - -Ddri3=$(call ptx/truefalse, PTXCONF_MESALIB_DRI3) \ > - -Degl=$(call ptx/truefalse, PTXCONF_MESALIB_EGL) \ > + -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ > + -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ > -Degl-lib-suffix= \ > -Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \ > -Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \ > -Dgallium-nine=false \ > -Dgallium-omx=disabled \ > -Dgallium-opencl=disabled \ > - -Dgallium-va=false \ > - -Dgallium-vdpau=false \ > - -Dgallium-xa=false \ > - -Dgallium-xvmc=false \ > - -Dgbm=$(call ptx/truefalse, PTXCONF_MESALIB_GBM) \ > + -Dgallium-va=disabled \ > + -Dgallium-vdpau=disabled \ > + -Dgallium-xa=disabled \ > + -Dgallium-xvmc=disabled \ > + -Dgbm=$(call ptx/endis, PTXCONF_MESALIB_GBM)d \ > -Dgles-lib-suffix= \ > - -Dgles1=$(call ptx/truefalse, PTXCONF_MESALIB_GLES1) \ > - -Dgles2=$(call ptx/truefalse, PTXCONF_MESALIB_GLES2) \ > + -Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \ > + -Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \ > -Dglvnd=false \ > -Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \ > -Dglx-direct=true \ > -Dglx-read-only-text=false \ > -Dinstall-intel-gpu-tests=false \ > - -Dlibunwind=false \ > - -Dllvm=false \ > - -Dlmsensors=$(call ptx/truefalse, PTXCONF_MESALIB_LMSENSORS) \ > + -Dlibunwind=disabled \ > + -Dllvm=disabled \ > + -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ > -Domx-libs-path=/usr/lib/dri \ > -Dopencl-spirv=false \ > -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ > @@ -127,25 +127,25 @@ MESALIB_CONF_OPT := \ > -Dosmesa-bits=8 \ > -Dplatform-sdk-version=25 \ > -Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \ > - -Dpower8=false \ > + -Dpower8=disabled \ > -Dprefer-iris=true \ > -Dselinux=false \ > - -Dshader-cache=$(call ptx/truefalse, PTXCONF_MESALIB_VULKAN_AMD) \ > - -Dshared-glapi=true \ > - -Dshared-llvm=false \ > + -Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_VULKAN_AMD)d \ > + -Dshared-glapi=enabled \ > + -Dshared-llvm=disabled \ > -Dshared-swr=true \ > -Dswr-arches=[] \ > -Dtools=[] \ > -Dva-libs-path=/usr/lib/dri \ > - -Dvalgrind=false \ > + -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 \ > - -Dxlib-lease=false \ > + -Dxlib-lease=disabled \ > -Dxvmc-libs-path=/usr/lib \ > - -Dzstd=$(call ptx/truefalse, PTXCONF_MESALIB_ZSTD) > + -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_ZSTD)d > > # ---------------------------------------------------------------------------- > # Compile _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de