summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gdal-1-fixes.patch47
-rw-r--r--src/gdal.mk4
-rw-r--r--src/gnutls.mk4
-rw-r--r--src/oce.mk11
-rw-r--r--src/proj-1-fixes.patch12
-rw-r--r--src/proj.mk4
6 files changed, 37 insertions, 45 deletions
diff --git a/src/gdal-1-fixes.patch b/src/gdal-1-fixes.patch
index 4544444..67b5895 100644
--- a/src/gdal-1-fixes.patch
+++ b/src/gdal-1-fixes.patch
@@ -1,15 +1,16 @@
This file is part of MXE.
See index.html for further information.
-From ffcbf5c48eb8d8ae6a1c20e1496f1866d7903af8 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MXE
Date: Sat, 18 Oct 2014 18:25:34 -0400
Subject: [PATCH 1/2] Fix geos detection
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/m4/geos.m4 b/m4/geos.m4
-index 386a2c8..cda1510 100644
+index 1111111..2222222 100644
--- a/m4/geos.m4
+++ b/m4/geos.m4
@@ -121,14 +121,14 @@ AC_DEFUN([GEOS_INIT],[
@@ -30,31 +31,36 @@ index 386a2c8..cda1510 100644
AC_CHECK_LIB([geos_c],
[GEOSversion],
---
-1.9.1
-
-From 3c60ec35bec710dc9e8fd6f0606abb7646b4f8eb Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Sat, 18 Oct 2014 18:33:43 -0400
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Tue, 5 Jul 2016 22:23:16 +0300
Subject: [PATCH 2/2] Use AC_PATH_TOOL for config scripts
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/configure.in b/configure.in
-index a0cf595..8ab4b5a 100644
+index 1111111..2222222 100644
--- a/configure.in
+++ b/configure.in
-@@ -640,7 +640,7 @@ AC_ARG_WITH(pg,
+@@ -866,7 +866,7 @@ AC_ARG_WITH(pg,
[Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,)
if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then
- AC_PATH_PROG(PG_CONFIG, pg_config, no)
+ AC_PATH_TOOL(PG_CONFIG, pg_config, no)
- else
+ else
PG_CONFIG=$with_pg
fi
-@@ -1719,10 +1719,10 @@ else
+@@ -2016,7 +2016,7 @@ KEA_CONFIG=no
+ AC_ARG_WITH(kea,[ --with-kea[=ARG] Include kealib (ARG=path to kea-config) [[default=yes]]],,)
+
+ if test "$with_kea" = "yes" -o "x$with_kea" = "x" ; then
+- AC_PATH_PROG(KEA_CONFIG, kea-config, no)
++ AC_PATH_TOOL(KEA_CONFIG, kea-config, no)
+ else
+ KEA_CONFIG=$with_kea
+ fi
+@@ -2079,10 +2079,10 @@ else
dnl find nc-config location
unset ac_cv_path_NETCDF_NCCONFIG
if test "$with_netcdf" = "yes" -o "$with_netcdf" = "" ; then
@@ -67,7 +73,7 @@ index a0cf595..8ab4b5a 100644
fi
dnl test nc-config
-@@ -2447,7 +2447,7 @@ MYSQL_CONFIG=no
+@@ -2832,7 +2832,7 @@ MYSQL_CONFIG=no
AC_ARG_WITH(mysql,[ --with-mysql[=ARG] Include MySQL (ARG=path to mysql_config) [[default=no]]],,)
if test "$with_mysql" = "yes" ; then
@@ -76,7 +82,7 @@ index a0cf595..8ab4b5a 100644
else
if test "x$with_mysql" != "x" ; then
MYSQL_CONFIG=$with_mysql
-@@ -2756,7 +2756,7 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then
+@@ -3162,7 +3162,7 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then
elif test "$with_curl" = "no" ; then
LIBCURL_CONFIG=no
else
@@ -85,7 +91,7 @@ index a0cf595..8ab4b5a 100644
fi
if test "$LIBCURL_CONFIG" != "no" ; then
-@@ -2798,7 +2798,7 @@ if test "`basename xx/$with_xml2`" = "xml2-config" ; then
+@@ -3204,7 +3204,7 @@ if test "`basename xx/$with_xml2`" = "xml2-config" ; then
elif test "$with_xml2" = "no" ; then
LIBXML2_CONFIG=no
else
@@ -95,7 +101,7 @@ index a0cf595..8ab4b5a 100644
if test "$LIBXML2_CONFIG" != "no" ; then
diff --git a/m4/geos.m4 b/m4/geos.m4
-index cda1510..3fb4490 100644
+index 1111111..2222222 100644
--- a/m4/geos.m4
+++ b/m4/geos.m4
@@ -58,7 +58,7 @@ AC_DEFUN([GEOS_INIT],[
@@ -116,6 +122,3 @@ index cda1510..3fb4490 100644
[]
)
---
-1.9.1
-
diff --git a/src/gdal.mk b/src/gdal.mk
index ff54ca4..ff785b5 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -3,8 +3,8 @@
PKG := gdal
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.0.2
-$(PKG)_CHECKSUM := db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4
+$(PKG)_VERSION := 2.1.0
+$(PKG)_CHECKSUM := eb499b18e5c5262a803bb7530ae56e95c3293be7b26c74bcadf67489203bf2cd
$(PKG)_SUBDIR := gdal-$($(PKG)_VERSION)
$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/gnutls.mk b/src/gnutls.mk
index a9a1445..8f30687 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -2,8 +2,8 @@
# See index.html for further information.
PKG := gnutls
-$(PKG)_VERSION := 3.4.13
-$(PKG)_CHECKSUM := fd3386e8e72725980bcd7f40949aa0121dcb7650b5147c6490e794555ed25859
+$(PKG)_VERSION := 3.4.14
+$(PKG)_CHECKSUM := 35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE)
diff --git a/src/oce.mk b/src/oce.mk
index 79a70e6..97c5c2f 100644
--- a/src/oce.mk
+++ b/src/oce.mk
@@ -3,8 +3,8 @@
PKG := oce
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.16.1
-$(PKG)_CHECKSUM := d31030c8da4a1b33f767d0d59895a995c8eabc8fc65cbe0558734f6021ea2f57
+$(PKG)_VERSION := 0.17.2
+$(PKG)_CHECKSUM := 8d9995360cd531cbd4a7aa4ca5ed969f08ec7c7a37755e2f3d4ef832c1b2f56e
$(PKG)_SUBDIR := $(PKG)-OCE-$($(PKG)_VERSION)
$(PKG)_FILE := OCE-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/tpaviot/oce/archive/$($(PKG)_FILE)
@@ -18,15 +18,16 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cd '$(1)' && cmake . \
- -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+ mkdir '$(1).build'
+ cd '$(1).build' && $(TARGET)-cmake '$(1)' \
-DOCE_BUILD_SHARED_LIB=$(if $(BUILD_STATIC),FALSE,TRUE) \
-DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \
-DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \
-DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \
-DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE
- $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
+ $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1
+ $(MAKE) -C '$(1).build' -j 1 install
cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
$(MAKE) -C '$(1)/examples/find_package_oce'
diff --git a/src/proj-1-fixes.patch b/src/proj-1-fixes.patch
deleted file mode 100644
index 3792b1c..0000000
--- a/src/proj-1-fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bruN proj-4.9.1.original/src/Makefile.in proj-4.9.1/src/Makefile.in
---- proj-4.9.1.original/src/Makefile.in 2016-04-05 10:59:38.834624359 +0200
-+++ proj-4.9.1/src/Makefile.in 2016-04-05 11:00:11.073813213 +0200
-@@ -400,7 +400,7 @@
- multistresstest_LDADD = libproj.la -lpthread
- test228_LDADD = libproj.la -lpthread
- lib_LTLIBRARIES = libproj.la
--libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0
-+libproj_la_LDFLAGS = -no-undefined -version-info 0:0:0
- libproj_la_SOURCES = \
- pj_list.h \
- PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
diff --git a/src/proj.mk b/src/proj.mk
index 5581ced..39d08d6 100644
--- a/src/proj.mk
+++ b/src/proj.mk
@@ -3,8 +3,8 @@
PKG := proj
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 4.9.1
-$(PKG)_CHECKSUM := fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319
+$(PKG)_VERSION := 4.9.2
+$(PKG)_CHECKSUM := 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
$(PKG)_SUBDIR := proj-$($(PKG)_VERSION)
$(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE)
generated by cgit v0.12 at 2024-07-16 21:54:36 (GMT)