Mercurial > mxe-octave

changeset 2657:8df445312d3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #57 from mgehre/pango Looks good. Thanks. package pango: split DllMain patch and make it callable
author mabrand <mabrand@mabrand.nl>
date Mon, 09 Jul 2012 04:22:16 -0700
parents 56b411cf95c3 (diff) 6e851800cb27 (current diff)
children ca2d19df9e6e
files
diffstat 21 files changed, 295 insertions(+), 126 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Tue Jun 19 12:06:07 2012 +0200
+++ b/index.html	Mon Jul 09 04:22:16 2012 -0700
@@ -955,7 +955,7 @@
     </tr>
     <tr>
         <td id="boost-package">boost</td>
-        <td id="boost-version">1.49.0</td>
+        <td id="boost-version">1.50.0</td>
         <td id="boost-website"><a href="http://www.boost.org/">Boost C++ Library</a></td>
     </tr>
     <tr>
@@ -1005,7 +1005,7 @@
     </tr>
     <tr>
         <td id="dbus-package">dbus</td>
-        <td id="dbus-version">1.6.0</td>
+        <td id="dbus-version">1.6.2</td>
         <td id="dbus-website"><a href="http://dbus.freedesktop.org/">dbus</a></td>
     </tr>
     <tr>
@@ -1100,7 +1100,7 @@
     </tr>
     <tr>
         <td id="gc-package">gc</td>
-        <td id="gc-version">7.2b</td>
+        <td id="gc-version">7.2c</td>
         <td id="gc-website"><a href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">gc</a></td>
     </tr>
     <tr>
@@ -1120,7 +1120,7 @@
     </tr>
     <tr>
         <td id="gcc-mpfr-package">gcc-mpfr</td>
-        <td id="gcc-mpfr-version">3.1.0</td>
+        <td id="gcc-mpfr-version">3.1.1</td>
         <td id="gcc-mpfr-website"><a href="http://www.mpfr.org/">MPFR for GCC</a></td>
     </tr>
     <tr>
@@ -1145,7 +1145,7 @@
     </tr>
     <tr>
         <td id="geos-package">geos</td>
-        <td id="geos-version">3.3.4</td>
+        <td id="geos-version">3.3.5</td>
         <td id="geos-website"><a href="http://trac.osgeo.org/geos/">GEOS</a></td>
     </tr>
     <tr>
@@ -1155,7 +1155,7 @@
     </tr>
     <tr>
         <td id="giflib-package">giflib</td>
-        <td id="giflib-version">4.2.0</td>
+        <td id="giflib-version">5.0.0</td>
         <td id="giflib-website"><a href="http://sourceforge.net/projects/libungif/">giflib</a></td>
     </tr>
     <tr>
@@ -1180,12 +1180,12 @@
     </tr>
     <tr>
         <td id="gnutls-package">gnutls</td>
-        <td id="gnutls-version">3.0.20</td>
+        <td id="gnutls-version">3.0.19</td>
         <td id="gnutls-website"><a href="http://www.gnu.org/software/gnutls/">GnuTLS</a></td>
     </tr>
     <tr>
         <td id="graphicsmagick-package">graphicsmagick</td>
-        <td id="graphicsmagick-version">1.3.15</td>
+        <td id="graphicsmagick-version">1.3.16</td>
         <td id="graphicsmagick-website"><a href="http://www.graphicsmagick.org/">GraphicsMagick</a></td>
     </tr>
     <tr>
@@ -1465,7 +1465,7 @@
     </tr>
     <tr>
         <td id="liboauth-package">liboauth</td>
-        <td id="liboauth-version">0.9.6</td>
+        <td id="liboauth-version">0.9.7</td>
         <td id="liboauth-website"><a href="http://liboauth.sourceforge.net/">liboauth</a></td>
     </tr>
     <tr>
@@ -1510,7 +1510,7 @@
     </tr>
     <tr>
         <td id="libshout-package">libshout</td>
-        <td id="libshout-version">2.3.0</td>
+        <td id="libshout-version">2.3.1</td>
         <td id="libshout-website"><a href="http://www.icecast.org/">libshout</a></td>
     </tr>
     <tr>
@@ -1550,7 +1550,7 @@
     </tr>
     <tr>
         <td id="libxml++-package">libxml++</td>
-        <td id="libxml++-version">2.35.2</td>
+        <td id="libxml++-version">2.35.3</td>
         <td id="libxml++-website"><a href="http://libxmlplusplus.sourceforge.net/">libxml2</a></td>
     </tr>
     <tr>
@@ -1600,12 +1600,12 @@
     </tr>
     <tr>
         <td id="mingwrt-package">mingwrt</td>
-        <td id="mingwrt-version">3.20</td>
+        <td id="mingwrt-version">3.20-2</td>
         <td id="mingwrt-website"><a href="http://www.mingw.org/">MinGW Runtime</a></td>
     </tr>
     <tr>
         <td id="mpfr-package">mpfr</td>
-        <td id="mpfr-version">3.1.0</td>
+        <td id="mpfr-version">3.1.1</td>
         <td id="mpfr-website"><a href="http://www.mpfr.org/">mpfr</a></td>
     </tr>
     <tr>
@@ -1625,7 +1625,7 @@
     </tr>
     <tr>
         <td id="nettle-package">nettle</td>
-        <td id="nettle-version">2.4</td>
+        <td id="nettle-version">2.5</td>
         <td id="nettle-website"><a href="http://www.lysator.liu.se/~nisse/nettle/">nettle</a></td>
     </tr>
     <tr>
@@ -1845,7 +1845,7 @@
     </tr>
     <tr>
         <td id="suitesparse-package">suitesparse</td>
-        <td id="suitesparse-version">4.0.0</td>
+        <td id="suitesparse-version">4.0.1</td>
         <td id="suitesparse-website"><a href="http://www.cise.ufl.edu/research/sparse/SuiteSparse/">SuiteSparse</a></td>
     </tr>
     <tr>
@@ -1945,7 +1945,7 @@
     </tr>
     <tr>
         <td id="xz-package">xz</td>
-        <td id="xz-version">5.0.3</td>
+        <td id="xz-version">5.0.4</td>
         <td id="xz-website"><a href="http://tukaani.org/xz/">XZ</a></td>
     </tr>
     <tr>
--- a/src/boost.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/boost.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := boost
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 26a52840e9d12f829e3008589abf0a925ce88524
+$(PKG)_CHECKSUM := ee06f89ed472cf369573f8acf9819fbc7173344e
 $(PKG)_SUBDIR   := boost_$(subst .,_,$($(PKG)_VERSION))
 $(PKG)_FILE     := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -17,9 +17,9 @@
 endef
 
 define $(PKG)_BUILD
+    # old version appears to interfere
+    rm -rf '$(PREFIX)/$(TARGET)/include/boost/'
     echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar ;' > '$(1)/user-config.jam'
-    # make the build script generate .a library files instead of .lib
-    $(SED) -i 's,<target-os>windows : lib ;,<target-os>windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam'
     # compile boost jam
     cd '$(1)/tools/build/v2/engine' && ./build.sh
     cd '$(1)' && tools/build/v2/engine/bin.*/bjam \
@@ -45,5 +45,8 @@
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \
         -DBOOST_THREAD_USE_LIB \
-        -lboost_serialization-mt -lboost_thread_win32-mt
+        -lboost_serialization-mt \
+        -lboost_thread_win32-mt \
+        -lboost_system-mt \
+        -lboost_chrono-mt
 endef
--- a/src/dbus-1-fixes.patch	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/dbus-1-fixes.patch	Mon Jul 09 04:22:16 2012 -0700
@@ -3,32 +3,10 @@
 
 Contains ad hoc patches for cross building.
 
-From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Tue, 4 Jan 2011 00:47:49 +0100
-Subject: [PATCH 1/2] always static in MXE
-
-
-diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
-index dcd3eeb..8324278 100644
---- a/dbus/dbus-macros.h
-+++ b/dbus/dbus-macros.h
-@@ -172,6 +172,7 @@
-  */
- 
- #if defined(_WIN32)
-+#  define DBUS_STATIC_BUILD
- #  if defined(DBUS_STATIC_BUILD)
- #  define DBUS_EXPORT
- #  elif defined(dbus_1_EXPORTS)
--- 
-1.7.6.3
-
-
 From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
 From: MXE
 Date: Fri, 23 Sep 2011 16:24:46 +0200
-Subject: [PATCH 2/2] add missing MemoryBarrier (MXE specific)
+Subject: [PATCH 1/1] add missing MemoryBarrier (MXE specific)
 
 Windows API has this, but it's not in MinGW.
 See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
--- a/src/dbus.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/dbus.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 9bfc971ff4cafa2741050d53a98cc7bfdc56880a
+$(PKG)_CHECKSUM := 09d55ac4ea4ccf0d233070909494028f5a4e1e63
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE)
@@ -26,6 +26,7 @@
         --disable-verbose-mode \
         --disable-asserts \
         --disable-shared \
+        --disable-maintainer-mode \
         --enable-static \
         --disable-silent-rules
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/gc.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/gc.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := gc
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 042b551d9e313557c8919375c669ae484237cf3e
+$(PKG)_CHECKSUM := 18c5b1aa9289a12fead3ceeda8fdc81f4ed08964
 $(PKG)_SUBDIR   := $(PKG)-7.2
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.hpl.hp.com/personal/Hans_Boehm/$(PKG)/$(PKG)_source/$($(PKG)_FILE)
--- a/src/gdal-1-fixes.patch	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/gdal-1-fixes.patch	Mon Jul 09 04:22:16 2012 -0700
@@ -1,13 +1,22 @@
 This file is part of MXE.
 See index.html for further information.
 
-Taken from http://trac.osgeo.org/gdal/changeset/24491?format=diff&new=24491
+From a0c0640eb7e98db4a9cbe5104abef8425d975712 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 4 Jul 2012 10:05:33 +0200
+Subject: [PATCH 1/2] giflib compatibility
 
-Index: gdal/frmts/gif/gifdataset.cpp
-===================================================================
---- gdal/frmts/gif/gifdataset.cpp	(revision 23621)
-+++ gdal/frmts/gif/gifdataset.cpp	(revision 24491)
-@@ -471,4 +471,26 @@
+Taken from http://trac.osgeo.org/gdal/changeset/24491?format=diff&new=24491
+---
+ frmts/gif/gifdataset.cpp |   30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp
+index c89f34c..1947edd 100644
+--- a/frmts/gif/gifdataset.cpp
++++ b/frmts/gif/gifdataset.cpp
+@@ -470,6 +470,28 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
+ }
  
  /************************************************************************/
 +/*                        GDALPrintGifError()                           */
@@ -34,7 +43,9 @@
 +/************************************************************************/
  /*                             CreateCopy()                             */
  /************************************************************************/
-@@ -597,7 +619,5 @@
+ 
+@@ -596,9 +618,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+                           psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR)
      {
          FreeMapObject(psGifCT);
 -        PrintGifError();
@@ -43,7 +54,9 @@
 +        GDALPrintGifError("Error writing gif file.");
          EGifCloseFile(hGifFile);
          VSIFCloseL( fp );
-@@ -623,7 +643,5 @@
+         return NULL;
+@@ -622,9 +642,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+ 
      if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
      {
 -        PrintGifError();
@@ -52,3 +65,167 @@
 +        GDALPrintGifError("Error writing gif file.");
          EGifCloseFile(hGifFile);
          VSIFCloseL( fp );
+         return NULL;
+-- 
+1.7.10.4
+
+
+From 7411f59dd769a72a79838e932d1a0988b04dc4d5 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 4 Jul 2012 10:42:33 +0200
+Subject: [PATCH 2/2] giflib 5 compatibility
+
+taken from
+http://trac.osgeo.org/gdal/changeset/24627
+---
+ frmts/gif/biggifdataset.cpp |    5 +++++
+ frmts/gif/gifdataset.cpp    |   43 ++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 41 insertions(+), 7 deletions(-)
+
+diff --git a/frmts/gif/biggifdataset.cpp b/frmts/gif/biggifdataset.cpp
+index e3029e5..6bed0dc 100644
+--- a/frmts/gif/biggifdataset.cpp
++++ b/frmts/gif/biggifdataset.cpp
+@@ -371,7 +371,12 @@ CPLErr BIGGIFDataset::ReOpen()
+     VSIFSeekL( fp, 0, SEEK_SET );
+ 
+     nLastLineRead = -1;
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    int nError;
++    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
++#else
+     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
++#endif
+     if( hGifFile == NULL )
+     {
+         CPLError( CE_Failure, CPLE_OpenFailed, 
+diff --git a/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp
+index 1947edd..0b99158 100644
+--- a/frmts/gif/gifdataset.cpp
++++ b/frmts/gif/gifdataset.cpp
+@@ -36,8 +36,17 @@ CPL_CVSID("$Id: gifdataset.cpp 23621 2011-12-20 23:26:56Z rouault $");
+ CPL_C_START
+ void	GDALRegister_GIF(void);
+ 
++#if !(defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5)
++
+ // This prototype seems to have been messed up!
+ GifFileType * EGifOpen(void* userData, OutputFunc writeFunc);
++
++// Define alias compatible with giflib >= 5.0.0
++#define GifMakeMapObject MakeMapObject
++#define GifFreeMapObject FreeMapObject
++
++#endif // defined(GIFLIB_MAJOR) && GIFLIB_MAJOR < 5
++
+ CPL_C_END
+ 
+ static const int InterlacedOffset[] = { 0, 4, 2, 1 }; 
+@@ -322,7 +331,12 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
+     if( fp == NULL )
+         return NULL;
+ 
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    int nError;
++    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
++#else
+     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
++#endif
+     if( hGifFile == NULL )
+     {
+         VSIFCloseL( fp );
+@@ -380,7 +394,12 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
+     DGifCloseFile( hGifFile );
+ 
+     VSIFSeekL( fp, 0, SEEK_SET);
++
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    hGifFile = DGifOpen( fp, VSIGIFReadFunc, &nError );
++#else
+     hGifFile = DGifOpen( fp, VSIGIFReadFunc );
++#endif
+     if( hGifFile == NULL )
+     {
+         VSIFCloseL( fp );
+@@ -473,14 +492,19 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
+ /*                        GDALPrintGifError()                           */
+ /************************************************************************/
+ 
+-static void GDALPrintGifError(const char* pszMsg)
++static void GDALPrintGifError(GifFileType *hGifFile, const char* pszMsg)
+ {
+ /* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
+ /* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
+ #if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
+         ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
+     /* Static string actually, hence the const char* cast */
++
++#if GIFLIB_MAJOR >= 5
++    const char* pszGIFLIBError = (const char*) GifErrorString(hGifFile->Error);
++#else
+     const char* pszGIFLIBError = (const char*) GifErrorString();
++#endif
+     if (pszGIFLIBError == NULL)
+         pszGIFLIBError = "Unknown error";
+     CPLError( CE_Failure, CPLE_AppDefined,
+@@ -557,7 +581,12 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+         return NULL;
+     }
+ 
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++    int nError;
++    hGifFile = EGifOpen( fp, VSIGIFWriteFunc, &nError );
++#else
+     hGifFile = EGifOpen( fp, VSIGIFWriteFunc );
++#endif
+     if( hGifFile == NULL )
+     {
+         VSIFCloseL( fp );
+@@ -577,7 +606,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+ 
+     if( poBand->GetColorTable() == NULL )
+     {
+-        psGifCT = MakeMapObject( 256, NULL );
++        psGifCT = GifMakeMapObject( 256, NULL );
+         for( iColor = 0; iColor < 256; iColor++ )
+         {
+             psGifCT->Colors[iColor].Red = (GifByteType) iColor;
+@@ -593,7 +622,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+         while( nFullCount < poCT->GetColorEntryCount() )
+             nFullCount = nFullCount * 2;
+ 
+-        psGifCT = MakeMapObject( nFullCount, NULL );
++        psGifCT = GifMakeMapObject( nFullCount, NULL );
+         for( iColor = 0; iColor < poCT->GetColorEntryCount(); iColor++ )
+         {
+             GDALColorEntry	sEntry;
+@@ -617,14 +646,14 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+     if (EGifPutScreenDesc(hGifFile, nXSize, nYSize, 
+                           psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR)
+     {
+-        FreeMapObject(psGifCT);
+-        GDALPrintGifError("Error writing gif file.");
++        GifFreeMapObject(psGifCT);
++        GDALPrintGifError(hGifFile, "Error writing gif file.");
+         EGifCloseFile(hGifFile);
+         VSIFCloseL( fp );
+         return NULL;
+     }
+     
+-    FreeMapObject(psGifCT);
++    GifFreeMapObject(psGifCT);
+     psGifCT = NULL;
+ 
+     /* Support for transparency */
+@@ -642,7 +671,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
+ 
+     if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
+     {
+-        GDALPrintGifError("Error writing gif file.");
++        GDALPrintGifError(hGifFile, "Error writing gif file.");
+         EGifCloseFile(hGifFile);
+         VSIFCloseL( fp );
+         return NULL;
+-- 
+1.7.10.4
+
--- a/src/geos.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/geos.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := geos
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 2ec4be729c851460daf89d0d2ab785be5ef4c5c5
+$(PKG)_CHECKSUM := 791e2b36a9a6114c7f213fae3fc995960c35a428
 $(PKG)_SUBDIR   := geos-$($(PKG)_VERSION)
 $(PKG)_FILE     := geos-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://download.osgeo.org/geos/$($(PKG)_FILE)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/giflib-1-fixes.patch	Mon Jul 09 04:22:16 2012 -0700
@@ -0,0 +1,32 @@
+This file is part of MXE.
+See index.html for further information.
+
+From e0bcec52c73afb97b91449f1e91cd4da8bf1582f Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 4 Jul 2012 08:58:48 +0200
+Subject: [PATCH] fix dir delimiter for mingw
+
+---
+ lib/egif_lib.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/egif_lib.c b/lib/egif_lib.c
+index 47be4d9..0e50b06 100644
+--- a/lib/egif_lib.c
++++ b/lib/egif_lib.c
+@@ -17,11 +17,10 @@ two modules will be linked.  Preserve this property!
+ 
+ #ifdef _WIN32
+ #include <io.h>
+-#include <sys\stat.h>
+ #else
+ #include <sys/types.h>
+-#include <sys/stat.h>
+ #endif /* _WIN32 */
++#include <sys/stat.h>
+ 
+ #include "gif_lib.h"
+ #include "gif_lib_private.h"
+-- 
+1.7.10.4
+
--- a/src/giflib.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/giflib.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,15 +3,19 @@
 
 PKG             := giflib
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := bc942711f75de7d8539f79be34d69c0d53c381c1
+$(PKG)_CHECKSUM := 0b032c2104a0956e2f91b6c11ff8c5515421cd8b
 $(PKG)_SUBDIR   := giflib-$($(PKG)_VERSION)
 $(PKG)_FILE     := giflib-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib-4.x/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib-5.x/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://sourceforge.net/projects/giflib/files/giflib 4.x/' | \
-    $(SED) -n 's,.*/giflib-\([0-9][^"]*\)/".*,\1,p' | \
+    $(WGET) -q -O- 'http://giflib.git.sourceforge.net/git/gitweb.cgi?p=giflib/giflib;a=tags' | \
+    grep '<a class="list name"' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
+    grep -v alpha | \
+    grep -v beta | \
+    grep -v rc | \
     head -1
 endef
 
@@ -23,5 +27,6 @@
         --disable-shared \
         --without-x \
         CPPFLAGS='-D_OPEN_BINARY'
+    echo 'all:' > '$(1)/doc/Makefile'
     $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install
 endef
--- a/src/gnutls-1-fixes.patch	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/gnutls-1-fixes.patch	Mon Jul 09 04:22:16 2012 -0700
@@ -3,10 +3,10 @@
 
 Contains ad hoc patches for cross building.
 
-From 1f08b1e9d6f6a03e0fe5e62aef85aa1021014953 Mon Sep 17 00:00:00 2001
+From 18aa82eb060ca9ded9720091300a6c31af8382a9 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 28 Oct 2011 09:23:41 +0200
-Subject: [PATCH 1/5] add missing static library linking
+Subject: [PATCH 1/4] add missing static library linking
 
 ---
  lib/gnutls.pc.in |    2 +-
@@ -25,13 +25,13 @@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 -- 
-1.7.9.2
+1.7.10.4
 
 
-From bbf2330693746cc45a3df65cba253ce44a353ac3 Mon Sep 17 00:00:00 2001
+From bd254ee873a2f7d6027661beae5d88372f10aa93 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 24 Nov 2011 15:06:06 +0100
-Subject: [PATCH 2/5] disable doc and test (mingw-cross-env specific)
+Subject: [PATCH 2/4] disable doc and test (mingw-cross-env specific)
 
 ---
  Makefile.am |    2 +-
@@ -51,13 +51,13 @@
  if HAVE_GUILE
  SUBDIRS += guile
 -- 
-1.7.9.2
+1.7.10.4
 
 
-From 5ee5355a9b34821b99f3f2fa83eb8435ccb45702 Mon Sep 17 00:00:00 2001
+From dce8795ce40246c87fc83d1879f02c9923dba2ed Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 3 Apr 2012 13:58:42 +0200
-Subject: [PATCH 3/5] Revert "make dist will also make lzip compressed
+Subject: [PATCH 3/4] Revert "make dist will also make lzip compressed
  tarball"
 
 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
@@ -66,10 +66,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f826704..bb4d044 100644
+index 0ad765c..74b778e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.20], [bug-gnutls@gnu.org])
+@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.19], [bug-gnutls@gnu.org])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_MACRO_DIR([m4])
  
@@ -79,13 +79,13 @@
  AM_CONFIG_HEADER(config.h)
  
 -- 
-1.7.9.2
+1.7.10.4
 
 
-From 7f22baaa57d160a22b49d25b8fa4024b754aedcd Mon Sep 17 00:00:00 2001
+From ae55a00b99a60b65e459ebe7ada215ace70b56db Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 6 Jun 2012 09:57:24 +0200
-Subject: [PATCH 4/5] AM_PROG_AR for automake 1.12 compatibility
+Subject: [PATCH 4/4] AM_PROG_AR for automake 1.12 compatibility
 
 Taken from
 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
@@ -94,7 +94,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index bb4d044..4c9c13a 100644
+index 74b778e..d045aaf 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -37,6 +37,7 @@ dnl Checks for programs.
@@ -106,34 +106,5 @@
  
  # For includes/gnutls/gnutls.h.in.
 -- 
-1.7.9.2
-
-
-From da583995c66f2df7cac31435d1609754a6853d07 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 6 Jun 2012 10:09:48 +0200
-Subject: [PATCH 5/5] add missing include wincrypt.h
-
-taken from
-http://lists.gnu.org/archive/html/gnutls-devel/2012-06/msg00001.html
----
- lib/gnutls_x509.c |    3 +++
- 1 file changed, 3 insertions(+)
+1.7.10.4
 
-diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
-index 71e0d69..130d75c 100644
---- a/lib/gnutls_x509.c
-+++ b/lib/gnutls_x509.c
-@@ -42,6 +42,9 @@
- #include "x509/x509_int.h"
- #include <gnutls_str_array.h>
- #include "read-file.h"
-+#if defined _WIN32 || defined __WIN32__
-+#include <wincrypt.h>
-+#endif
- 
- /*
-  * some x509 certificate parsing functions.
--- 
-1.7.9.2
-
--- a/src/gnutls.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/gnutls.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_CHECKSUM := 0c65f6a1e669c0fe85ddb2d645078b3bce9d1518
+$(PKG)_CHECKSUM := df55f60a0426de1f0efb5c1a902e209b069b3d51
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)
@@ -22,7 +22,7 @@
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
     cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install
     cd '$(1)' && autoconf
-    cd '$(1)' && automake
+    cd '$(1)' && automake --add-missing
     # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw.
     # Value taken from http://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx
     cd '$(1)' && ./configure \
--- a/src/graphicsmagick.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/graphicsmagick.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := graphicsmagick
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 59ab01a1a8a12b26955c64bb2b660b6283855204
+$(PKG)_CHECKSUM := 8025d64fcafe94a6b9fd72efe66ceab3472f168a
 $(PKG)_SUBDIR   := GraphicsMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
--- a/src/liboauth.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/liboauth.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := liboauth
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 9182ca5d7e127589d132377b807d0c8a8878b122
+$(PKG)_CHECKSUM := a5a957ac1538b23a286de4e39a2c9f98ef4c3c0e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://liboauth.sourceforge.net/pool/$($(PKG)_FILE)
--- a/src/libshout.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/libshout.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := libshout
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := a6f26441ec27b6f9b55fba38b99bd1d7ca17fecf
+$(PKG)_CHECKSUM := 147c5670939727420d0e2ad6a20468e2c2db1e20
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
--- a/src/libxml++.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/libxml++.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := libxml++
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 112d6e26a8ce1426aa8931f26ea593484b2081f0
+$(PKG)_CHECKSUM := b2e5ba6066e7fb96cca88e7c37e1e4848552c245
 $(PKG)_SUBDIR   := libxml++-$($(PKG)_VERSION)
 $(PKG)_FILE     := libxml++-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
@@ -19,6 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && CXX="$(TARGET)-g++ -mthreads" ./configure \
         --host='$(TARGET)' \
+        --build="`config.guess`" \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         MAKE=$(MAKE)
--- a/src/mingwrt.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/mingwrt.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,10 +3,10 @@
 
 PKG             := mingwrt
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 7c63f3695968054b7236282f35562bb3a2c388d4
+$(PKG)_CHECKSUM := cc6c1f841ab255e52e60f9c967cea6acf29354db
 $(PKG)_SUBDIR   := .
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-rt/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-mingw32-dev.tar.lzma
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mingw/MinGW/Base/mingw-rt/mingwrt-3.20/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
--- a/src/mpfr.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/mpfr.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,9 +3,9 @@
 
 PKG             := mpfr
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 9ba6dfe62dad298f0570daf182db31660f7f016c
+$(PKG)_CHECKSUM := 7527c322b91fe8e6055ead551e1b46b9f1712ccd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gmp
--- a/src/nettle.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/nettle.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := nettle
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 1df0cd013e83f73b78a5521411a67e331de3dfa6
+$(PKG)_CHECKSUM := 1061754feb69dd01354525fa7eb6154b28ac887d
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
@@ -19,8 +19,9 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
-        --enable-static \
+        --build="`config.guess`" \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
--- a/src/suitesparse-1.patch	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/suitesparse-1.patch	Mon Jul 09 04:22:16 2012 -0700
@@ -1,7 +1,7 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 60ff05e30eaa435a7776b178f5f240f0c11e8f38 Mon Sep 17 00:00:00 2001
+From 169f88aef7ff1d302aa3eac48d779d009780b87f Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 20 May 2012 23:41:27 +0200
 Subject: [PATCH] build lib not demo
@@ -12,10 +12,10 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CHOLMOD/Makefile b/CHOLMOD/Makefile
-index d27ae54..878f9d8 100644
+index 97911ef..4a3bcae 100644
 --- a/CHOLMOD/Makefile
 +++ b/CHOLMOD/Makefile
-@@ -13,7 +13,7 @@ include ../UFconfig/UFconfig.mk
+@@ -14,7 +14,7 @@ include ../SuiteSparse_config/SuiteSparse_config.mk
  
  # Compile the C-callable libraries and the Demo programs.
  all:
@@ -25,12 +25,12 @@
  # Compile the C-callable libraries only.
  library:
 diff --git a/UMFPACK/Makefile b/UMFPACK/Makefile
-index 6163045..4973e55 100644
+index 622ee39..e19cd2f 100644
 --- a/UMFPACK/Makefile
 +++ b/UMFPACK/Makefile
-@@ -13,7 +13,7 @@ include ../UFconfig/UFconfig.mk
- # compile all C code (except hb, fortran, and fortran64), including AMD and the
- # demos, but not the MATLAB mexFunctions
+@@ -12,7 +12,7 @@ include ../SuiteSparse_config/SuiteSparse_config.mk
+ 
+ # compile all C code (except hb, fortran, and fortran64), incl. AMD and demos
  all:
 -	( cd Demo   ; $(MAKE) )
 +	( cd Lib    ; $(MAKE) )
@@ -38,5 +38,5 @@
  # compile just the C-callable UMFPACK library
  library:
 -- 
-1.7.9.2
+1.7.10.4
 
--- a/src/suitesparse.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/suitesparse.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := suitesparse
-$(PKG)_CHECKSUM := 4f1f5af64625606d58c129087a66d58d90c4dd58
+$(PKG)_CHECKSUM := 7fa5e21ed5bb8a7445e17ff52442db31cb55b6d1
 $(PKG)_SUBDIR   := SuiteSparse
 $(PKG)_FILE     := SuiteSparse-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.cise.ufl.edu/research/sparse/SuiteSparse/$($(PKG)_FILE)
--- a/src/xz.mk	Tue Jun 19 12:06:07 2012 +0200
+++ b/src/xz.mk	Mon Jul 09 04:22:16 2012 -0700
@@ -3,7 +3,7 @@
 
 PKG             := xz
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 50ce842bea6519537457d9ad90d110a127656786
+$(PKG)_CHECKSUM := 3e976d7715fde43422572c70f927bfdae56a94c3
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://tukaani.org/xz/$($(PKG)_FILE)
@@ -18,9 +18,9 @@
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build="`config.guess`" \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
-        --disable-dynamic \
         --disable-threads \
         --disable-nls
     $(MAKE) -C '$(1)'/src/liblzma -j '$(JOBS)' install