Mercurial > mxe-octave

changeset 5602:fcfd6e32eb1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Fix native Linux build. * src/mesa.mk: Explicitly disable xlib-lease when not using the system X11 libraries because we are not building the necessary dependencies (xrandr).
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 20 Dec 2020 10:21:14 +0100
parents 537a9bb5d35b
children b2b0469ab69b
files src/mesa.mk
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/mesa.mk	Sat Dec 19 12:51:02 2020 +0100
+++ b/src/mesa.mk	Sun Dec 20 10:21:14 2020 +0100
@@ -26,6 +26,7 @@
 else
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes
+    $(PKG)_BUILD_X11_LIBS_FLAGS = -Dxlib-lease=disabled
   else
     $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$(BUILD_PKG_CONFIG_PATH)
   endif
@@ -36,7 +37,8 @@
 
   $(PKG)_X11_FLAGS := -Dplatforms='x11' \
       -Dglx=gallium-xlib \
-      -Ddri-drivers=''
+      -Ddri-drivers='' \
+      $($(PKG)_BUILD_X11_LIBS_FLAGS)
 endif
 
 define $(PKG)_BUILD