Merge pull request #7256 from SupervisedThinking/up_mesa_glvnd

mesa: enable/depend on libglvnd only for nvidia drivers
This commit is contained in:
CvH 2022-12-22 11:05:34 +01:00 committed by GitHub
commit 0e41c5e9d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,14 +32,27 @@ PKG_MESON_OPTS_TARGET="-Ddri-drivers= \
-Dosmesa=false"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd"
PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr"
export X11_INCLUDES=
PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true"
PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 \
-Ddri3=enabled \
-Dglx=dri"
elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland wayland-protocols libglvnd"
PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland -Ddri3=disabled -Dglx=disabled -Dglvnd=true"
PKG_DEPENDS_TARGET+=" wayland wayland-protocols"
PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland \
-Ddri3=disabled \
-Dglx=disabled"
else
PKG_MESON_OPTS_TARGET+=" -Dplatforms="" -Ddri3=disabled -Dglx=disabled -Dglvnd=false"
PKG_MESON_OPTS_TARGET+=" -Dplatforms="" \
-Ddri3=disabled \
-Dglx=disabled"
fi
if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)"; then
PKG_DEPENDS_TARGET+=" libglvnd"
PKG_MESON_OPTS_TARGET+=" -Dglvnd=true"
else
PKG_MESON_OPTS_TARGET+=" -Dglvnd=false"
fi
if [ "${LLVM_SUPPORT}" = "yes" ]; then