Mercurial > mxe-octave

changeset 3785:e1e69acf0bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osmesa: added for offscreen rendering with OpenGL toolkits
author Andreas Weber <andy.weber.aw@gmail.com>
date Fri, 13 Feb 2015 21:25:57 +0100
parents 5796aeaa4df4
children e515bc026d10
files dist-files.mk index.html src/default-octave.mk src/octave.mk src/osmesa.mk src/stable-octave.mk
diffstat 6 files changed, 35 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Feb 08 11:56:57 2015 -0800
+++ b/dist-files.mk	Fri Feb 13 21:25:57 2015 +0100
@@ -132,6 +132,7 @@
   glibmm.mk \
   glpk-1-fixes.patch \
   glpk.mk \
+  glproto.mk \
   gmp.mk \
   gnu-linux-ghostscript-configure.patch \
   gnuplot-1-fixes.patch \
@@ -485,6 +486,7 @@
   openscenegraph.mk \
   openssl-1-fixes.patch \
   openssl.mk \
+  osmesa.mk \
   pango.mk \
   pangomm.mk \
   pcre.mk \
--- a/index.html	Sun Feb 08 11:56:57 2015 -0800
+++ b/index.html	Fri Feb 13 21:25:57 2015 +0100
@@ -1978,6 +1978,10 @@
         <td class="website"><a href="http://www.openssl.org/">openssl</a></td>
     </tr>
     <tr>
+        <td class="package">osmesa</td>
+        <td class="website"><a href="http://www.mesa3d.org/osmesa.html">OSMesa</a></td>
+    </tr>
+    <tr>
         <td class="package">pango</td>
         <td class="website"><a href="http://www.pango.org/">Pango</a></td>
     </tr>
--- a/src/default-octave.mk	Sun Feb 08 11:56:57 2015 -0800
+++ b/src/default-octave.mk	Fri Feb 13 21:25:57 2015 +0100
@@ -14,7 +14,7 @@
 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
 endif
--- a/src/octave.mk	Sun Feb 08 11:56:57 2015 -0800
+++ b/src/octave.mk	Fri Feb 13 21:25:57 2015 +0100
@@ -11,7 +11,7 @@
 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
 endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/osmesa.mk	Fri Feb 13 21:25:57 2015 +0100
@@ -0,0 +1,26 @@
+# This file is part of MXE Octave.
+# See index.html for further information.
+
+PKG             := osmesa
+$(PKG)_VERSION  := 10.2.2
+$(PKG)_CHECKSUM := 2cc7c5b80fd2ddbf540acf47dbaec68e8cab16a4
+$(PKG)_SUBDIR   := Mesa-$($(PKG)_VERSION)
+$(PKG)_FILE     := MesaLib-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/current/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        --disable-dri --disable-egl --without-gallium-drivers \
+        --enable-osmesa \
+        && $(CONFIGURE_POST_HOOK)
+endef
--- a/src/stable-octave.mk	Sun Feb 08 11:56:57 2015 -0800
+++ b/src/stable-octave.mk	Fri Feb 13 21:25:57 2015 +0100
@@ -11,7 +11,7 @@
 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
 endif