Mercurial > mxe-octave
comparison src/mesa.mk @ 4520:0f62ac5c6fd8
mesa: Don't depend on s2tc if using system OpenGL.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 27 Oct 2017 18:04:34 -0400 |
parents | 1fdd8063e38d |
children | 1a99b0de71dc |
comparison
equal
deleted
inserted
replaced
4519:58de4f56c797 | 4520:0f62ac5c6fd8 |
---|---|
5 $(PKG)_VERSION := 17.2.1 | 5 $(PKG)_VERSION := 17.2.1 |
6 $(PKG)_CHECKSUM := 7429e74a0ef12ea9d60b41b2b852898b3da0b238 | 6 $(PKG)_CHECKSUM := 7429e74a0ef12ea9d60b41b2b852898b3da0b238 |
7 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) | 7 $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) |
8 $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz | 8 $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz |
9 $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) | 9 $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) |
10 $(PKG)_DEPS := build-mako s2tc zlib | 10 $(PKG)_DEPS := build-mako zlib |
11 ifeq ($(MXE_WINDOWS_BUILD),yes) | 11 ifeq ($(MXE_WINDOWS_BUILD),yes) |
12 ifeq ($(USE_SYSTEM_OPENGL),no) | 12 ifeq ($(USE_SYSTEM_OPENGL),no) |
13 $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi | 13 $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi |
14 $(PKG)_DEPS += s2tc | |
14 endif | 15 endif |
15 else | 16 else |
16 ifeq ($(USE_SYSTEM_OPENGL),yes) | 17 ifeq ($(USE_SYSTEM_OPENGL),yes) |
17 $(PKG)_CONFIGURE_OPENGL_OPTIONS := \ | 18 $(PKG)_CONFIGURE_OPENGL_OPTIONS := \ |
18 --disable-opengl --disable-egl --disable-gles1 --disable-gles2 \ | 19 --disable-opengl --disable-egl --disable-gles1 --disable-gles2 \ |
25 --with-gallium-drivers="swrast" --with-dri-drivers="" \ | 26 --with-gallium-drivers="swrast" --with-dri-drivers="" \ |
26 --with-platforms="x11" | 27 --with-platforms="x11" |
27 ifeq ($(USE_SYSTEM_X11_LIBS),no) | 28 ifeq ($(USE_SYSTEM_X11_LIBS),no) |
28 $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes | 29 $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes |
29 endif | 30 endif |
30 $(PKG)_DEPS += llvm | 31 $(PKG)_DEPS += llvm s2tc |
31 endif | 32 endif |
32 endif | 33 endif |
33 | 34 |
34 define $(PKG)_UPDATE | 35 define $(PKG)_UPDATE |
35 echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; | 36 echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; |