Thanks, applied as b5841dbb182d514bf275cf31cf426a666714accf. Michael
[sent from post-receive hook] On Mon, 09 Dec 2024 12:43:23 +0100, Philipp Zabel <[email protected]> wrote: > https://docs.mesa3d.org/relnotes/24.3.0.html > https://docs.mesa3d.org/relnotes/24.3.1.html > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make > index ac72ebeac16d..84acd8ea2b9e 100644 > --- a/rules/host-mesalib.make > +++ b/rules/host-mesalib.make > @@ -30,8 +30,6 @@ HOST_MESALIB_CONF_OPT := \ > -Ddatasources=auto \ > -Ddraw-use-llvm=false \ > -Ddri-drivers-path=/usr/lib/dri \ > - -Ddri-search-path=/usr/lib/dri \ > - -Ddri3=disabled \ > -Degl=disabled \ > -Degl-lib-suffix= \ > -Degl-native-platform=auto \ > @@ -46,9 +44,9 @@ HOST_MESALIB_CONF_OPT := \ > -Dgallium-drivers=softpipe \ > -Dgallium-extra-hud=false \ > -Dgallium-nine=false \ > - -Dgallium-omx=disabled \ > -Dgallium-opencl=disabled \ > -Dgallium-rusticl=false \ > + -Dgallium-rusticl-enable-drivers= \ > -Dgallium-va=disabled \ > -Dgallium-vdpau=disabled \ > -Dgallium-wgl-dll-name=libgallium_wgl \ > @@ -71,6 +69,7 @@ HOST_MESALIB_CONF_OPT := \ > -Dinstall-intel-gpu-tests=false \ > -Dintel-clc=$(call ptx/ifdef, > PTXCONF_HOST_MESALIB_INTEL_CLC,enabled,system) \ > -Dintel-rt=disabled \ > + -Dlegacy-x11=none \ > -Dlibunwind=disabled \ > -Dllvm=$(call ptx/endis, PTXCONF_HOST_MESALIB_INTEL_CLC)d \ > -Dllvm-orcjit=false \ > @@ -78,7 +77,6 @@ HOST_MESALIB_CONF_OPT := \ > -Dmicrosoft-clc=disabled \ > -Dmin-windows-version=8 \ > -Dmoltenvk-dir= \ > - -Domx-libs-path=/usr/lib/dri \ > -Dopencl-spirv=false \ > -Dopengl=true \ > -Dosmesa=false \ > @@ -87,7 +85,6 @@ HOST_MESALIB_CONF_OPT := \ > -Dplatforms= \ > -Dpower8=disabled \ > -Dradv-build-id='' \ > - -Dselinux=false \ > -Dshader-cache=disabled \ > -Dshader-cache-default=true \ > -Dshader-cache-max-size=1G \ > diff --git a/rules/mesalib.in b/rules/mesalib.in > index ed2c9124e049..f77fb0a69f25 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -13,6 +13,7 @@ menuconfig MESALIB > select HOST_GLSLANG if MESALIB_VULKAN_AMD > select HOST_GLSLANG if MESALIB_VULKAN_INTEL > select HOST_GLSLANG if MESALIB_VULKAN_OVERLAY > + select HOST_GLSLANG if MESALIB_VULKAN_SCREENSHOT > select GCCLIBS > select GCCLIBS_CXX > select LIBDRM > @@ -25,6 +26,7 @@ menuconfig MESALIB > select LIBDRM_RADEON if MESALIB_DRI_RADEONSI > select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU > select LIBELF if MESALIB_DRI_RADEONSI > + select LIBPNG if MESALIB_VULKAN_SCREENSHOT > select LLVM if MESALIB_LLVM > select LLVM_TARGET_TARGET if MESALIB_DRI_LLVMPIPE > select LLVM_TARGET_AMDGPU if MESALIB_DRI_RADEONSI > @@ -307,6 +309,10 @@ config MESALIB_VULKAN_OVERLAY > bool > prompt "Overlay layer" > > +config MESALIB_VULKAN_SCREENSHOT > + bool > + prompt "Screenshot layer" > + > config MESALIB_SHADER_CACHE > bool > prompt "enable shader cache" > diff --git a/rules/mesalib.make b/rules/mesalib.make > index d97eb647dd66..78ab95c1e4a3 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 24.2.7 > -MESALIB_MD5 := c245ce6fe6ef8db7b5e62eb754c54449 > +MESALIB_VERSION := 24.3.1 > +MESALIB_MD5 := ab0c9a102e6713fca2b8c955b368fe57 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \ > @@ -123,6 +123,7 @@ MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst > swrast,lvp,$(MESALIB_VULKAN_D > 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_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_SCREENSHOT) += screenshot > > MESALIB_LIBS-y := libglapi > MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL > @@ -160,8 +161,6 @@ MESALIB_CONF_OPT := \ > -Ddatasources=auto \ > -Ddraw-use-llvm=true \ > -Ddri-drivers-path=/usr/lib/dri \ > - -Ddri-search-path=/usr/lib/dri \ > - -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ > -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ > -Degl-lib-suffix= \ > -Degl-native-platform=auto \ > @@ -176,9 +175,9 @@ MESALIB_CONF_OPT := \ > -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-rusticl=false \ > + -Dgallium-rusticl-enable-drivers= \ > -Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \ > -Dgallium-vdpau=disabled \ > -Dgallium-wgl-dll-name=libgallium_wgl \ > @@ -201,6 +200,7 @@ MESALIB_CONF_OPT := \ > -Dinstall-intel-gpu-tests=false \ > -Dintel-clc=system \ > -Dintel-rt=disabled \ > + -Dlegacy-x11=none \ > -Dlibunwind=disabled \ > -Dllvm=$(call ptx/endis, PTXCONF_MESALIB_LLVM)d \ > -Dllvm-orcjit=false \ > @@ -208,7 +208,6 @@ MESALIB_CONF_OPT := \ > -Dmicrosoft-clc=disabled \ > -Dmin-windows-version=8 \ > -Dmoltenvk-dir= \ > - -Domx-libs-path=/usr/lib/dri \ > -Dopencl-spirv=false \ > -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ > -Dosmesa=false \ > @@ -217,7 +216,6 @@ MESALIB_CONF_OPT := \ > -Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \ > -Dpower8=disabled \ > -Dradv-build-id='' \ > - -Dselinux=false \ > -Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d \ > -Dshader-cache-default=true \ > -Dshader-cache-max-size=1G \ > @@ -311,6 +309,9 @@ endif > > @$(foreach lib, $(MESALIB_LIBS-y), \ > $(call install_lib, mesalib, 0, 0, 0644, $(lib))$(ptx/nl)) > +ifdef PTXCONF_MESALIB_GBM > + @$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/gbm/dri_gbm.so) > +endif > > @$(call install_finish, mesalib) >
