# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1424028991 18000
# Node ID 26f72c8e2be78e65f542895f97ba20e98766d0c8
# Parent  a169ad26bac29091fb32067a1e779289192edb1a
include osmesa in octave deps for all systems

diff -r a169ad26bac2 -r 26f72c8e2be7 src/default-octave.mk
--- a/src/default-octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/default-octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -14,9 +14,9 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
diff -r a169ad26bac2 -r 26f72c8e2be7 src/octave.mk
--- a/src/octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -11,9 +11,9 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
diff -r a169ad26bac2 -r 26f72c8e2be7 src/stable-octave.mk
--- a/src/stable-octave.mk	Sun Feb 15 13:33:36 2015 -0500
+++ b/src/stable-octave.mk	Sun Feb 15 14:36:31 2015 -0500
@@ -11,9 +11,9 @@
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext osmesa
+  $(PKG)_DEPS += x11 xext
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull