Mercurial > mxe-octave
changeset 2314:f04ef4f56cf0
update packages proj, poco
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Sun, 25 Mar 2012 02:14:38 +1100 |
| parents | 4041ae430f22 |
| children | 2b5ea5239144 |
| files | src/poco.mk src/proj-1-mutex-win32.patch src/proj.mk |
| diffstat | 3 files changed, 4 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/poco.mk Sun Mar 25 01:43:58 2012 +1100 +++ b/src/poco.mk Sun Mar 25 02:14:38 2012 +1100 @@ -4,8 +4,8 @@ # POCO C++ Libraries PKG := poco $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.1p1 -$(PKG)_CHECKSUM := e9810b8fc14c607626d7d3c74baf60726a61e83c +$(PKG)_VERSION := 1.4.3p1 +$(PKG)_CHECKSUM := 9e1ef31d369c67eef2d3ce1ca8f2b6ac5cc38ec4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_WEBSITE := http://pocoproject.org/
--- a/src/proj-1-mutex-win32.patch Sun Mar 25 01:43:58 2012 +1100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://trac.osgeo.org/proj/ticket/56 -http://trac.osgeo.org/proj/changeset/1790 - ---- proj/src/pj_mutex.c (revision 1788) -+++ proj/src/pj_mutex.c (revision 1790) -@@ -38,6 +38,8 @@ - #endif - --#ifdef _WIN32 -+/* on win32 we always use win32 mutexes, even if pthreads are available */ -+#if defined(_WIN32) && !defined(MUTEX_stub) - # define MUTEX_win32 -+# undef MUTEX_pthread - #endif
--- a/src/proj.mk Sun Mar 25 01:43:58 2012 +1100 +++ b/src/proj.mk Sun Mar 25 02:14:38 2012 +1100 @@ -4,8 +4,8 @@ # proj PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 4.7.0 -$(PKG)_CHECKSUM := bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7 +$(PKG)_VERSION := 4.8.0 +$(PKG)_CHECKSUM := 5c8d6769a791c390c873fef92134bf20bb20e82a $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://trac.osgeo.org/proj/