From 29f8a035095f9cba529c5bfe061e0bb725007715 Mon Sep 17 00:00:00 2001
From: Rashad <mohammedrashadkm@gmail.com>
Date: Tue, 9 Jun 2015 03:43:35 +0200
Subject: do not turn on c++11 for boost

---
 src/boost.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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), \
-- 
cgit v0.12


From 55ea9efdcb164e641a16e61af550a1955d6e45b6 Mon Sep 17 00:00:00 2001
From: Rashad <mohammedrashadkm@gmail.com>
Date: Tue, 9 Jun 2015 03:44:10 +0200
Subject: fix ltmain.sh for geotiff. gdal shared link error

---
 src/libgeotiff-1-libtoolfilemagic.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/libgeotiff-1-libtoolfilemagic.patch

diff --git a/src/libgeotiff-1-libtoolfilemagic.patch b/src/libgeotiff-1-libtoolfilemagic.patch
new file mode 100644
index 0000000..2b213ea
--- /dev/null
+++ b/src/libgeotiff-1-libtoolfilemagic.patch
@@ -0,0 +1,12 @@
+diff -bur libgeotiff-1.4.0.orig/ltmain.sh libgeotiff-1.4.0/ltmain.sh
+--- libgeotiff-1.4.0.orig/ltmain.sh	2014-10-24 01:20:03.172985419 +0530
++++ libgeotiff-1.4.0/ltmain.sh	2014-10-24 01:58:50.983491081 +0530
+@@ -2560,7 +2560,7 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++       $EGREP 'file format pe-i386(.*architecture: i386)?|pe-x86-64' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 |
+ 	$SED -n -e '
+ 	    1,100{
-- 
cgit v0.12


From 9762fbc9e4f659d760900d8a30f7b9663971274a Mon Sep 17 00:00:00 2001
From: Rashad <mohammedrashadkm@gmail.com>
Date: Tue, 9 Jun 2015 03:44:56 +0200
Subject: enable shared

---
 src/gdal.mk | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/gdal.mk b/src/gdal.mk
index f95d5e1..3e6d10a 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' | \
@@ -23,29 +23,29 @@ define $(PKG)_CONFIGURE
     cd '$(1)' && autoreconf -fi
     # The option '--without-threads' means native win32 threading without pthread.
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build='$(BUILD)' \
-        --enable-static \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --with-bsb \
+    $(MXE_CONFIGURE_OPTS) \
+    --with-bsb \
         --with-grib \
         --with-ogr \
         --with-pam \
         --without-threads \
-        --with-static-proj4 \
+        --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)' \
         --with-gta='$(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 \
@@ -99,8 +99,3 @@ define $(PKG)_BUILD_i686-w64-mingw32
         LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`"
     $($(PKG)_MAKE)
 endef
-
-# Can't use $(PKG)_BUILD_SHARED here as $(PKG)_BUILD_i686-w64-mingw32 has a
-# higher precedence.
-$(PKG)_BUILD_i686-w64-mingw32.shared =
-$(PKG)_BUILD_x86_64-w64-mingw32.shared =
-- 
cgit v0.12


From ca2549174c6ae817e30168044315dc9a87de56d5 Mon Sep 17 00:00:00 2001
From: Rashad M <mohammedrashadkm@gmail.com>
Date: Sun, 21 Jun 2015 12:44:57 +0200
Subject: libgeotiff: remove ltmain.sh patch and use autoreconf -fi

---
 src/libgeotiff-1-fixes.patch            | 12 ++++++++++++
 src/libgeotiff-1-libtoolfilemagic.patch | 12 ------------
 src/libgeotiff.mk                       |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 src/libgeotiff-1-fixes.patch
 delete mode 100644 src/libgeotiff-1-libtoolfilemagic.patch

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-1-libtoolfilemagic.patch b/src/libgeotiff-1-libtoolfilemagic.patch
deleted file mode 100644
index 2b213ea..0000000
--- a/src/libgeotiff-1-libtoolfilemagic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bur libgeotiff-1.4.0.orig/ltmain.sh libgeotiff-1.4.0/ltmain.sh
---- libgeotiff-1.4.0.orig/ltmain.sh	2014-10-24 01:20:03.172985419 +0530
-+++ libgeotiff-1.4.0/ltmain.sh	2014-10-24 01:58:50.983491081 +0530
-@@ -2560,7 +2560,7 @@
-     ;;
-   *ar\ archive*) # could be an import, or static
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+       $EGREP 'file format pe-i386(.*architecture: i386)?|pe-x86-64' >/dev/null ; then
-       win32_nmres=`eval $NM -f posix -A $1 |
- 	$SED -n -e '
- 	    1,100{
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 \
-- 
cgit v0.12