diff options
| author | Tony Theodore <tonyt@logyst.com> | 2012-03-24 15:14:38 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-03-24 15:14:38 (GMT) |
| commit | ea418eb0796717a7177691cae06387f9a92fef64 (patch) | |
| tree | 1b36e9dbd3d1f5dca65f29fcef8c804e82db2a90 | |
| parent | 94e28a86c8cf92b64e324f5427b085ac30c4482a (diff) | |
| download | mxe-ea418eb0796717a7177691cae06387f9a92fef64.zip mxe-ea418eb0796717a7177691cae06387f9a92fef64.tar.gz mxe-ea418eb0796717a7177691cae06387f9a92fef64.tar.bz2 | |
update packages proj, poco
| -rw-r--r-- | src/poco.mk | 4 | ||||
| -rw-r--r-- | src/proj-1-mutex-win32.patch | 18 | ||||
| -rw-r--r-- | src/proj.mk | 4 |
3 files changed, 4 insertions, 22 deletions
diff --git a/src/poco.mk b/src/poco.mk index 01c91ec..156d8c7 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -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/ diff --git a/src/proj-1-mutex-win32.patch b/src/proj-1-mutex-win32.patch deleted file mode 100644 index 97f289a..0000000 --- a/src/proj-1-mutex-win32.patch +++ /dev/null @@ -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 diff --git a/src/proj.mk b/src/proj.mk index 202375a..7b7b439 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -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/ |