From 909ef1aac09e2318adb891d31d91fc6c2d7ff3a2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 Sep 2017 22:16:44 +0200 Subject: [PATCH] gdal: bump version. --- ...{gdal-1.11.0.recipe => gdal-1.11.5.recipe} | 8 +- sci-libs/gdal/patches/gdal-1.11.0.patchset | 141 ------------------ sci-libs/gdal/patches/gdal-1.11.5.patchset | 22 +++ 3 files changed, 26 insertions(+), 145 deletions(-) rename sci-libs/gdal/{gdal-1.11.0.recipe => gdal-1.11.5.recipe} (93%) delete mode 100644 sci-libs/gdal/patches/gdal-1.11.0.patchset create mode 100644 sci-libs/gdal/patches/gdal-1.11.5.patchset diff --git a/sci-libs/gdal/gdal-1.11.0.recipe b/sci-libs/gdal/gdal-1.11.5.recipe similarity index 93% rename from sci-libs/gdal/gdal-1.11.0.recipe rename to sci-libs/gdal/gdal-1.11.5.recipe index a33e7a205..998aeff47 100644 --- a/sci-libs/gdal/gdal-1.11.0.recipe +++ b/sci-libs/gdal/gdal-1.11.5.recipe @@ -28,9 +28,9 @@ COPYRIGHT="2007-2014 Even Rouault 2009-2014 Martin Landa 2013 ZJU Walkinfo Technology Corp., Ltd." LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="http://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" -CHECKSUM_SHA256="b5186b5817e94743de1bceef66aeee1461687e14f73bf81034fcf0377eacbcc3" +CHECKSUM_SHA256="d4fdc3e987b9926545f0a514b4328cd733f2208442f8d03bde630fe1f7eff042" PATCHES="gdal-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -42,7 +42,7 @@ fi PROVIDES=" gdal$secondaryArchSuffix = $portVersion compat >= 1.11 - lib:libgdal$secondaryArchSuffix = 1.18.0 compat >= 1.18 + lib:libgdal$secondaryArchSuffix = 1.18.5 compat >= 1.18 cmd:gdal_contour cmd:gdal_grid cmd:gdal_rasterize @@ -82,7 +82,7 @@ REQUIRES=" PROVIDES_devel=" gdal${secondaryArchSuffix}_devel = $portVersion compat >= 1.11 cmd:gdal_config$secondaryArchSuffix - devel:libgdal$secondaryArchSuffix = 1.18.0 compat >= 1.18 + devel:libgdal$secondaryArchSuffix = 1.18.5 compat >= 1.18 " REQUIRES_devel=" gdal$secondaryArchSuffix == $portVersion base diff --git a/sci-libs/gdal/patches/gdal-1.11.0.patchset b/sci-libs/gdal/patches/gdal-1.11.0.patchset deleted file mode 100644 index bab6f5f21..000000000 --- a/sci-libs/gdal/patches/gdal-1.11.0.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From 23a40a62e1324e004098e2dfc163ce102b6bb41b Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 -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 - diff --git a/sci-libs/gdal/patches/gdal-1.11.5.patchset b/sci-libs/gdal/patches/gdal-1.11.5.patchset new file mode 100644 index 000000000..95ff4db44 --- /dev/null +++ b/sci-libs/gdal/patches/gdal-1.11.5.patchset @@ -0,0 +1,22 @@ +From 395833faacca66c6d83b9c8b73161ef77604ca09 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 23 Aug 2014 11:46:17 +0000 +Subject: link with network + + +diff --git a/apps/GNUmakefile b/apps/GNUmakefile +index f9950df..83c1eda 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 $@ +-- +2.13.1 +