diff options
| -rw-r--r-- | src/boost.mk | 2 | ||||
| -rw-r--r-- | src/gdal.mk | 15 | ||||
| -rw-r--r-- | src/libgeotiff-1-fixes.patch | 12 | ||||
| -rw-r--r-- | src/libgeotiff.mk | 1 |
4 files changed, 24 insertions, 6 deletions
diff --git a/src/boost.mk b/src/boost.mk index 0c7f6fe..954fd15 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -43,6 +43,7 @@ define $(PKG)_BUILD target-os=windows \ threadapi=win32 \ threading=multi \ + variant=release \ toolset=gcc-mxe \ --layout=tagged \ --disable-icu \ @@ -54,7 +55,6 @@ define $(PKG)_BUILD --includedir='$(PREFIX)/$(TARGET)/include' \ -sEXPAT_INCLUDE='$(PREFIX)/$(TARGET)/include' \ -sEXPAT_LIBPATH='$(PREFIX)/$(TARGET)/lib' \ - cxxflags='-std=c++11' \ install $(if $(BUILD_SHARED), \ diff --git a/src/gdal.mk b/src/gdal.mk index cc4d477..cd3275a 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -3,15 +3,15 @@ PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.11.1 -$(PKG)_CHECKSUM := e2c67481932ec9fb6ec3c0faadc004f715c4eef4 +$(PKG)_VERSION := 1.11.2 +$(PKG)_CHECKSUM := 6f3ccbe5643805784812072a33c25be0bbff00db $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc proj zlib libpng libxml2 tiff libgeotiff jpeg jasper \ +$(PKG)_DEPS := gcc proj zlib libpng libxml2 tiff libgeotiff jpeg openjpeg \ giflib expat sqlite curl geos postgresql gta hdf4 hdf5 \ - json-c netcdf + json-c netcdf armadillo define $(PKG)_UPDATE $(WGET) -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \ @@ -29,12 +29,13 @@ define $(PKG)_CONFIGURE --with-ogr \ --with-pam \ --without-threads \ + --with-armadillo='$(PREFIX)/$(TARGET)' \ --with-libz='$(PREFIX)/$(TARGET)' \ --with-png='$(PREFIX)/$(TARGET)' \ --with-libtiff='$(PREFIX)/$(TARGET)' \ --with-geotiff='$(PREFIX)/$(TARGET)' \ --with-jpeg='$(PREFIX)/$(TARGET)' \ - --with-jasper='$(PREFIX)/$(TARGET)' \ + --with-openjpeg='$(PREFIX)/$(TARGET)' \ --with-gif='$(PREFIX)/$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ --with-sqlite3='$(PREFIX)/$(TARGET)' \ @@ -42,6 +43,10 @@ define $(PKG)_CONFIGURE --with-hdf4='$(PREFIX)/$(TARGET)' \ --with-hdf5='$(PREFIX)/$(TARGET)' \ --with-libjson-c='$(PREFIX)/$(TARGET)' \ + --with-netcdf='$(PREFIX)/$(TARGET)' \ + --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \ + --with-xml2='$(PREFIX)/$(TARGET)/bin/xml2-config' \ + --without-jasper \ --without-odbc \ --without-xerces \ --without-grass \ diff --git a/src/libgeotiff-1-fixes.patch b/src/libgeotiff-1-fixes.patch new file mode 100644 index 0000000..aa831b4 --- /dev/null +++ b/src/libgeotiff-1-fixes.patch @@ -0,0 +1,12 @@ +diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac +--- libgeotiff-1.4.0.orig/configure.ac 2015-06-21 03:50:03.341076086 +0200 ++++ libgeotiff-1.4.0/configure.ac 2015-06-21 03:50:39.741125191 +0200 +@@ -280,7 +280,7 @@ + PROJ_INC=-I$PROJ_INC + + AC_SUBST(PROJ_INC,$PROJ_INC) +- AC_DEFINE(HAVE_PROJECTS_H) ++ AC_DEFINE([HAVE_PROJECTS_H], [], [Description]) + AC_DEFINE(HAVE_LIBPROJ) + AC_SUBST([HAVE_LIBPROJ]) + PROJ_CONFIG="yes" diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index 6dfd961..bdd41fd 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -20,6 +20,7 @@ endef define $(PKG)_BUILD $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in' touch '$(1)/configure' + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-jpeg \ |