From 23a40a62e1324e004098e2dfc163ce102b6bb41b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Aug 2014 09:50:06 +0000
Subject: fix for giblib 5.1.0+


diff --git a/frmts/gif/biggifdataset.cpp b/frmts/gif/biggifdataset.cpp
index f996508..3f43bdb 100644
--- a/frmts/gif/biggifdataset.cpp
+++ b/frmts/gif/biggifdataset.cpp
@@ -339,7 +339,7 @@ CPLErr BIGGIFDataset::ReOpen()
 /*      If the file is already open, close it so we can restart.        */
 /* -------------------------------------------------------------------- */
     if( hGifFile != NULL )
-        DGifCloseFile( hGifFile );
+        DGifCloseFile( hGifFile, NULL );
 
 /* -------------------------------------------------------------------- */
 /*      If we are actually reopening, then we assume that access to     */
@@ -413,7 +413,7 @@ CPLErr BIGGIFDataset::ReOpen()
 
     if( RecordType != IMAGE_DESC_RECORD_TYPE )
     {
-        DGifCloseFile( hGifFile );
+        DGifCloseFile( hGifFile, NULL );
         hGifFile = NULL;
 
         CPLError( CE_Failure, CPLE_OpenFailed, 
@@ -423,7 +423,7 @@ CPLErr BIGGIFDataset::ReOpen()
     
     if (DGifGetImageDesc(hGifFile) == GIF_ERROR)
     {
-        DGifCloseFile( hGifFile );
+        DGifCloseFile( hGifFile, NULL );
         hGifFile = NULL;
 
         CPLError( CE_Failure, CPLE_OpenFailed, 
diff --git a/frmts/gif/gifabstractdataset.cpp b/frmts/gif/gifabstractdataset.cpp
index 81c6ec3..ee2e192 100644
--- a/frmts/gif/gifabstractdataset.cpp
+++ b/frmts/gif/gifabstractdataset.cpp
@@ -82,7 +82,7 @@ GIFAbstractDataset::~GIFAbstractDataset()
     }
 
     if( hGifFile )
-        DGifCloseFile( hGifFile );
+        DGifCloseFile( hGifFile, NULL );
 
     if( fp != NULL )
         VSIFCloseL( fp );
diff --git a/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp
index 62a8793..ba0e9c9 100644
--- a/frmts/gif/gifdataset.cpp
+++ b/frmts/gif/gifdataset.cpp
@@ -386,13 +386,13 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
             CPLDebug( "GIF",
                       "Due to limitations of the GDAL GIF driver we deliberately avoid\n"
                       "opening large GIF files (larger than 100 megapixels).");
-            DGifCloseFile( hGifFile );
+            DGifCloseFile( hGifFile, NULL );
             VSIFCloseL( fp );
             return NULL;
         }
     }
 
-    DGifCloseFile( hGifFile );
+    DGifCloseFile( hGifFile, NULL );
 
     VSIFSeekL( fp, 0, SEEK_SET);
 
@@ -417,7 +417,7 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo )
     if( nGifErr != GIF_OK || hGifFile->SavedImages == NULL )
     {
         VSIFCloseL( fp );
-        DGifCloseFile(hGifFile);
+        DGifCloseFile(hGifFile, NULL);
 
         if( nGifErr == D_GIF_ERR_DATA_TOO_BIG )
         {
@@ -649,7 +649,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
     {
         GifFreeMapObject(psGifCT);
         GDALPrintGifError(hGifFile, "Error writing gif file.");
-        EGifCloseFile(hGifFile);
+        EGifCloseFile(hGifFile, NULL);
         VSIFCloseL( fp );
         return NULL;
     }
@@ -673,7 +673,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
     if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
     {
         GDALPrintGifError(hGifFile, "Error writing gif file.");
-        EGifCloseFile(hGifFile);
+        EGifCloseFile(hGifFile, NULL);
         VSIFCloseL( fp );
         return NULL;
     }
@@ -756,7 +756,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
 /* -------------------------------------------------------------------- */
 /*      cleanup                                                         */
 /* -------------------------------------------------------------------- */
-    if (EGifCloseFile(hGifFile) == GIF_ERROR)
+    if (EGifCloseFile(hGifFile, NULL) == GIF_ERROR)
     {
         CPLError( CE_Failure, CPLE_AppDefined, 
                   "EGifCloseFile() failed.\n" );
@@ -807,7 +807,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
 
 error:
     if (hGifFile)
-        EGifCloseFile(hGifFile);
+        EGifCloseFile(hGifFile, NULL);
     if (fp)
         VSIFCloseL( fp );
     if (pabyScanline)
-- 
1.8.3.4


From bcdf3ce6740587ccc42a8cbe1741d79853566cec Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Aug 2014 11:46:17 +0000
Subject: link with network


diff --git a/apps/GNUmakefile b/apps/GNUmakefile
index 77a44ec..5c52554 100644
--- a/apps/GNUmakefile
+++ b/apps/GNUmakefile
@@ -46,7 +46,7 @@ gdalinfo$(EXE):	gdalinfo.$(OBJ_EXT) commonutils.$(OBJ_EXT) $(DEP_LIBS)
 	$(LD) $(LNK_FLAGS) $< commonutils.$(OBJ_EXT) $(XTRAOBJ) $(CONFIG_LIBS) -o $@
 
 gdalserver$(EXE):	gdalserver.$(OBJ_EXT) $(DEP_LIBS)
-	$(LD) $(LNK_FLAGS) $< $(XTRAOBJ) $(CONFIG_LIBS) -o $@
+	$(LD) $(LNK_FLAGS) -lnetwork $< $(XTRAOBJ) $(CONFIG_LIBS) -o $@
 
 gdal_translate$(EXE):	gdal_translate.$(OBJ_EXT) commonutils.$(OBJ_EXT) $(DEP_LIBS)
 	$(LD) $(LNK_FLAGS) $< commonutils.$(OBJ_EXT) $(XTRAOBJ) $(CONFIG_LIBS) -o $@
-- 
1.8.3.4

