# HG changeset patch # User John W. Eaton # Date 1509141874 14400 # Node ID 0f62ac5c6fd83ec8a57fa022d85306e15afa0d08 # Parent 58de4f56c797768fc55d97ae47dc305a8e3fea85 mesa: Don't depend on s2tc if using system OpenGL. diff -r 58de4f56c797 -r 0f62ac5c6fd8 src/mesa.mk --- a/src/mesa.mk Thu Oct 19 17:11:27 2017 -0400 +++ b/src/mesa.mk Fri Oct 27 18:04:34 2017 -0400 @@ -7,10 +7,11 @@ $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) -$(PKG)_DEPS := build-mako s2tc zlib +$(PKG)_DEPS := build-mako zlib ifeq ($(MXE_WINDOWS_BUILD),yes) ifeq ($(USE_SYSTEM_OPENGL),no) $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi + $(PKG)_DEPS += s2tc endif else ifeq ($(USE_SYSTEM_OPENGL),yes) @@ -27,7 +28,7 @@ ifeq ($(USE_SYSTEM_X11_LIBS),no) $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes endif - $(PKG)_DEPS += llvm + $(PKG)_DEPS += llvm s2tc endif endif