From eed69d1c78706318a4e195143301138ab0d3a246 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sun, 3 Feb 2019 19:25:48 +0100 Subject: [PATCH] GDAL: bump (#3607) --- sci-libs/gdal/gdal-2.3.1.recipe | 231 ------------------ .../{gdal-2.2.4.recipe => gdal-2.4.0.recipe} | 20 +- 2 files changed, 17 insertions(+), 234 deletions(-) delete mode 100644 sci-libs/gdal/gdal-2.3.1.recipe rename sci-libs/gdal/{gdal-2.2.4.recipe => gdal-2.4.0.recipe} (90%) diff --git a/sci-libs/gdal/gdal-2.3.1.recipe b/sci-libs/gdal/gdal-2.3.1.recipe deleted file mode 100644 index 902881e6e..000000000 --- a/sci-libs/gdal/gdal-2.3.1.recipe +++ /dev/null @@ -1,231 +0,0 @@ -SUMMARY="The Geospatial Data Abstraction Library" -DESCRIPTION="GDAL is a translator library for raster and vector geospatial \ -data formats that is released under an X/MIT style OpenSource license by the \ -Open Source Geospatial Foundation. As a library, it presents a single raster \ -abstract data model and vector abstract data model to the calling application \ -for all supported formats. It also comes with a variety of useful \ -commandline utilies for data translation and processing." -HOMEPAGE="https://gdal.org/" -COPYRIGHT="2007-2017 Even Rouault - 2015-2017 Planet Labs - 2017 Hobu Inc - 2009-2016 Martin Landa - 2013-2016 NextGIS - 2016 Alexandr Borzykh - 2016 Andrew Sudorgin - 2016 Avyav Kumar Singh - 2016 Dmitry Baryshnikov - 2016 Julien Michel - 2016 Lucian Plesea - 2016 Piers Titus van der Torren - 2016 SatCen - European Union Satellite Centre - 2005 2007-2008 2010 2013 2015 Tamas Szekeres - 2006-2008 2010 2015 Ivan Lucena - 2015 Airbus DS Geo SA - 2015 European Union (European Environment Agency) - 2015 European Union Satellite Centre - 2015 Faza Mahamood - 2015 Sean Gillies - 2010 2013-2014 Kyle Shannon - 2008-2014 Antonio Valentino - 2004 2014 Pirmin Kalberer Sourcepole AG - 2013-2014 ZJU Walkinfo Technology Corp. Ltd - 2014 François Hissel - 2014 Matthieu Volat - 2014 Mikhail Gusev - 2014 Norman Barker - 2014 Oslandia - 2014 Sebastian Walter - 1998-2013 Frank Warmerdam - 2009-2013 Jorge Arevalo - 2009-2013 David Zwarg - 2011 2013 Paul Ramsey - 2013 Alan Boudreault - 2013 EOX IT Services GmbH - 2012 Andrew Migal - 2012 Jean-Claude Repetto - 2012 LibKEA - 2012 Roger Veciana - 2010-2011 Martin Lambers - 2011 Adam Estrada - 2011 Alessandro Furieri - 2011 Ben Ahmed Daho Ali - 2005-2007 2010 Daylon Graphics Ltd - 2006-2007 2010 Mateusz Loskot - 2009-2010 PCI Geomatics 50 West Wilmot Street Richmond Hill Ont Canada - 2009-2010 Ragi Yaser Burhum - 2010 Brian Case - 2010 Chaitanya kumar CH - 2010 Chris Yesson - 2010 Constantin Jucovschi - 2010 ESRI - 2010 Seth Price - 2010 SPADAC Inc. - 2010 Thomas Hirsch - 2002-2009 Andrey Kiselev - 2009 Leonardo de Paula Rosa Piga - 2009 Volker Wichmann - 1998-2008 Daniel Morissette - 2006 2008 Henrik Johansson - 2007-2008 Howard Butler - 2008 Chris Toney - 2008 Her majesty the Queen in right of Canada as represented by the Canadian Nuclear Safety Commission - 2008 Klokan Petr Pridal - 2008 Shawn Gervais - 2008 Xiuguang Zhou (ESRI) - 2004 2007 ITC - 2005 2007 Ari Jolma - 2005 2007 Kevin Ruland - 2006-2007 Waypoint Information Technology - 2007 Adam Guernsey - 2007 Adam Nowacki - 2007 Andrea Aime - 2007 Chris Schmidt - 2007 Christian Mueller - 2007 Geoconcept and IGN - 2007 Jens Oberender - 2007 Philippe P. Vachon - 2006 Benjamin Collins - 2006 Christopher Condit - 2006 James Flemer - 2006 Kevin Locke - 2006 MapShots Inc - 2006 Oleg Semykin - 2006 The MITRE Corporation - 2005 Benjamin Simon - 2005 Daniel Wallner - 2005 Frans van den Bergh - 2005 Radim Blazek - 2005 Sam Gillingham - 2005 Vexcel Corp - 2004 Kor de Jong - 2004 VIZRT Inc - 1999-2003 Stephane Villeneuve - 2003 Applied Coherent Technology Corporation - 2003 OPeNDAP Inc - 1999 2001-2002 Safe Software Inc. - 2000-2002 Avenza Systems Inc. - 2002 i3 - information integration and imaging Fort Collin,CO - 2002 Mark Phillips - 2000-2001 Atlantis Scientific Inc - 2001 Keyhole Inc. - 2001 Simon Perkins - 2000 Derrick J Brashear - 1999 Intergraph Corporation - 1999 Les Technologies SoftMap Inc - 1998 Global Geomatics - 1992 Michigan State University - PCRaster owners" -LICENSE="MIT - GNU GPL v3" -REVISION="1" -SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" -CHECKSUM_SHA256="9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" -if [ $targetArchitecture != x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -libVersion=20.4.1 -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - gdal$secondaryArchSuffix = $portVersion - lib:libgdal$secondaryArchSuffix = $libVersionCompat - cmd:gdal_contour = $portVersion - cmd:gdal_grid = $portVersion - cmd:gdal_rasterize = $portVersion - cmd:gdal_translate = $portVersion - cmd:gdaladdo = $portVersion - cmd:gdalbuildvrt = $portVersion - cmd:gdaldem = $portVersion - cmd:gdalenhance = $portVersion - cmd:gdalinfo = $portVersion - cmd:gdallocationinfo = $portVersion - cmd:gdalmanage = $portVersion - cmd:gdalserver = $portVersion - cmd:gdalsrsinfo = $portVersion - cmd:gdaltindex = $portVersion - cmd:gdaltransform = $portVersion - cmd:gdalwarp = $portVersion - cmd:gnmanalyse = $portVersion - cmd:gnmmanage = $portVersion - cmd:nearblack = $portVersion - cmd:ogr2ogr = $portVersion - cmd:ogrinfo = $portVersion - cmd:ogrlineref = $portVersion - cmd:ogrtindex = $portVersion - cmd:testepsg = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libexpat$secondaryArchSuffix - lib:libgeotiff$secondaryArchSuffix - lib:libgif$secondaryArchSuffix >= 7.0.0 - lib:libiconv$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libproj$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - gdal${secondaryArchSuffix}_devel = $portVersion - cmd:gdal_config$secondaryArchSuffix - devel:libgdal$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - gdal$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libexpat$secondaryArchSuffix - devel:libgeotiff$secondaryArchSuffix - devel:libgif$secondaryArchSuffix >= 7.0.0 - devel:libiconv$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libproj$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -defineDebugInfoPackage gdal$secondaryArchSuffix \ - $libDir/libgdal.so.$libVersion - -BUILD() -{ - export LDFLAGS="-lnetwork" - expatDir=$portPackageLinksDir/lib~libexpat - runConfigure --omit-dirs "dataDir" ./configure --with-expat=$expatDir \ - --datadir="$dataDir"/gdal - make $jobArgs -} - -INSTALL() -{ - make install - - # Cleanup - rm -f $libDir/libgdal.la - - prepareInstalledDevelLib libgdal - fixPkgconfig - - # devel package - packageEntries devel \ - $binDir/gdal-config \ - $developDir -} diff --git a/sci-libs/gdal/gdal-2.2.4.recipe b/sci-libs/gdal/gdal-2.4.0.recipe similarity index 90% rename from sci-libs/gdal/gdal-2.2.4.recipe rename to sci-libs/gdal/gdal-2.4.0.recipe index c7013802d..46faa0f77 100644 --- a/sci-libs/gdal/gdal-2.2.4.recipe +++ b/sci-libs/gdal/gdal-2.4.0.recipe @@ -118,9 +118,9 @@ COPYRIGHT="2007-2017 Even Rouault PCRaster owners" LICENSE="MIT GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" -CHECKSUM_SHA256="441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278" +CHECKSUM_SHA256="c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -130,7 +130,7 @@ if [ $targetArchitecture != x86_gcc2 ]; then fi portVersionCompat="$portVersion compat >= 1.11" -libVersion=20.3.3 +libVersion=20.5.0 libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -163,15 +163,22 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libarmadillo$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libgeotiff$secondaryArchSuffix lib:libgif$secondaryArchSuffix >= 7.0.0 + lib:libhdf5$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix + lib:libnetcdf$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libproj$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libtiff$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libzstd$secondaryArchSuffix " PROVIDES_devel=" @@ -185,15 +192,22 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libarmadillo$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libgeotiff$secondaryArchSuffix devel:libgif$secondaryArchSuffix >= 7.0.0 + devel:libhdf5$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:libnetcdf$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libproj$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libzstd$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal