Mercurial > mxe-octave
changeset 2899:b4e625571bf6 stable
Include fontconfig and freetype as a dependencies of Octave.
Allow configuring with opengl.
Patch Octave configure script to use pkg-config to check for freetype
libraries.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 04 Dec 2012 13:44:38 -0500 |
| parents | 81e4b37912bf |
| children | 2784771bed32 71294b7ce782 |
| files | src/octave-1-fixes.patch src/octave.mk |
| diffstat | 2 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/octave-1-fixes.patch Tue Dec 04 10:47:21 2012 -0500 +++ b/src/octave-1-fixes.patch Tue Dec 04 13:44:38 2012 -0500 @@ -25,3 +25,28 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ +--- a/configure.ac 2012-05-31 11:20:35.000000000 -0400 ++++ b/configure.ac 2012-12-04 12:50:58.666092831 -0500 +@@ -857,9 +857,19 @@ + + ## freetype 2 + +- AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) +- XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], +- [warn_freetype="FreeType library not found. Native graphics will be disabled."]) ++ PKG_CHECK_MODULES([FT2], [freetype2], [ ++ min_ft2_version=9.03 ++ AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version]) ++ $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version ++ ac_status=$? ++ if test $ac_status = 0; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) ++ XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS" ++ else ++ AC_MSG_RESULT(no) ++ warn_freetype="FreeType library not found. Native graphics will be disabled." ++ fi]) + + ## fontconfig library +
--- a/src/octave.mk Tue Dec 04 10:47:21 2012 -0500 +++ b/src/octave.mk Tue Dec 04 13:44:38 2012 -0500 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://gnu.org/gnu/octave/$($(PKG)_FILE) -$(PKG)_DEPS := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib +$(PKG)_DEPS := arpack blas curl fftw fltk fontconfig freetype gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package octave.' >&2; @@ -15,14 +15,14 @@ endef define $(PKG)_BUILD - # build GCC and support libraries + cd '$(1)' && autoreconf mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ - --without-opengl \ --disable-docs \ + FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \ gl_cv_func_gettimeofday_clobber=no $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install