Mercurial > mxe-octave

changeset 4496:903796b2fcb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fltk, gl2ps, xcursor, x11, qtbase: Fix dependencies.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Oct 2017 16:22:23 -0400
parents 4f00764eb5c2
children e7d902eeefda
files src/fltk.mk src/gl2ps.mk src/qtbase.mk src/x11.mk src/xcursor.mk
diffstat 5 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/fltk.mk	Fri Oct 06 16:21:54 2017 -0400
+++ b/src/fltk.mk	Fri Oct 06 16:22:23 2017 -0400
@@ -16,9 +16,12 @@
 else
   $(PKG)_DEPS   += pthreads freetype
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
-    $(PKG)_DEPS += x11 xext xrender xdmcp
+    $(PKG)_DEPS += x11 xcursor xext xrender xdmcp
   endif
 endif
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa glu
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.fltk.org/' | \
--- a/src/gl2ps.mk	Fri Oct 06 16:21:54 2017 -0400
+++ b/src/gl2ps.mk	Fri Oct 06 16:22:23 2017 -0400
@@ -8,6 +8,9 @@
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://geuz.org/$(PKG)/src/$($(PKG)_FILE)
 $(PKG)_DEPS     := libpng zlib
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa glu
+endif
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
     ifeq ($(MXE_SYSTEM),msvc)
--- a/src/qtbase.mk	Fri Oct 06 16:21:54 2017 -0400
+++ b/src/qtbase.mk	Fri Oct 06 16:22:23 2017 -0400
@@ -12,6 +12,9 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
+ifeq ($(USE_SYSTEM_OPENGL),no)
+  $(PKG)_DEPS += mesa
+endif
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm
--- a/src/x11.mk	Fri Oct 06 16:21:54 2017 -0400
+++ b/src/x11.mk	Fri Oct 06 16:22:23 2017 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := libX11-$($(PKG)_VERSION)
 $(PKG)_FILE     := libX11-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
-$(PKG)_DEPS     := inputproto kbproto xcb xcursor xextproto xproto xtrans
+$(PKG)_DEPS     := inputproto kbproto xcb xextproto xproto xtrans
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
--- a/src/xcursor.mk	Fri Oct 06 16:21:54 2017 -0400
+++ b/src/xcursor.mk	Fri Oct 06 16:22:23 2017 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := libXcursor-$($(PKG)_VERSION)
 $(PKG)_FILE     := libXcursor-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := fixesproto x11 xfixes xrender
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD