From a50e2008e650a9bb8132ee85d79edd4b15c191bb Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 8 Jan 2025 07:55:00 +0100 Subject: [PATCH] gdal*, revbump for newer tiff (#11604) --- sci-libs/gdal/gdal-3.4.2.recipe | 4 +- sci-libs/gdal/gdal302-3.0.2.recipe | 6 +- sci-libs/gdal/patches/gdal-3.4.2.patchset | 69 ++++++++++++++++++-- sci-libs/gdal/patches/gdal302-3.0.2.patchset | 32 +++++++-- 4 files changed, 95 insertions(+), 16 deletions(-) diff --git a/sci-libs/gdal/gdal-3.4.2.recipe b/sci-libs/gdal/gdal-3.4.2.recipe index 02b75e1dc..1ef5eaeba 100644 --- a/sci-libs/gdal/gdal-3.4.2.recipe +++ b/sci-libs/gdal/gdal-3.4.2.recipe @@ -118,7 +118,7 @@ COPYRIGHT="2007-2017 Even Rouault PCRaster owners" LICENSE="MIT GNU GPL v3" -REVISION="4" +REVISION="5" SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" CHECKSUM_SHA256="16baf03dfccf9e3f72bb2e15cd2d5b3f4be0437cdff8a785bceab0c7be557335" PATCHES="gdal-3.4.2.patchset" @@ -133,7 +133,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion=30.0.2 +libVersion="30.0.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/sci-libs/gdal/gdal302-3.0.2.recipe b/sci-libs/gdal/gdal302-3.0.2.recipe index a439b1651..38118349a 100644 --- a/sci-libs/gdal/gdal302-3.0.2.recipe +++ b/sci-libs/gdal/gdal302-3.0.2.recipe @@ -118,7 +118,7 @@ COPYRIGHT="2007-2017 Even Rouault PCRaster owners" LICENSE="MIT GNU GPL v3" -REVISION="7" +REVISION="8" SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" CHECKSUM_SHA256="c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983" SOURCE_DIR="gdal-$portVersion" @@ -134,7 +134,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libVersion=26.0.2 +libVersion="26.0.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -179,7 +179,7 @@ REQUIRES=" lib:libpng16$secondaryArchSuffix lib:libproj$secondaryArchSuffix lib:libssl$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix >= 6 lib:libwebp$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix diff --git a/sci-libs/gdal/patches/gdal-3.4.2.patchset b/sci-libs/gdal/patches/gdal-3.4.2.patchset index 2f68471b1..922b39f73 100644 --- a/sci-libs/gdal/patches/gdal-3.4.2.patchset +++ b/sci-libs/gdal/patches/gdal-3.4.2.patchset @@ -1,14 +1,11 @@ -From d4bd3978bd52d63c1085f1cf76a74987a609a057 Mon Sep 17 00:00:00 2001 +From 0ab0c85ddc28d1f865898acb129fd2e1e1ab62fd Mon Sep 17 00:00:00 2001 From: Sam Gillingham Date: Sat, 23 Apr 2022 15:57:06 +0000 -Subject: [PATCH] add checks for haiku +Subject: add checks for haiku ---- - port/cpl_vsil_unix_stdio_64.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/port/cpl_vsil_unix_stdio_64.cpp b/port/cpl_vsil_unix_stdio_64.cpp -index bdc1c68e68..32e3b03091 100644 +index e769466..bb6e3e3 100644 --- a/port/cpl_vsil_unix_stdio_64.cpp +++ b/port/cpl_vsil_unix_stdio_64.cpp @@ -1023,7 +1023,7 @@ begin: @@ -39,5 +36,63 @@ index bdc1c68e68..32e3b03091 100644 #endif ) -- -2.30.2 +2.45.2 + + +From 45bb5115051cdfb403bddb014d59ffca96e8eb68 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Tue, 7 Jan 2025 19:39:04 +0100 +Subject: fix for: error: 'numeric_limits' is not a member of 'std' + + +diff --git a/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp b/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp +index 2753083..a8b15c6 100644 +--- a/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp ++++ b/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + + using namespace PCIDSK; +diff --git a/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp b/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp +index df5611d..154b1fb 100644 +--- a/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp ++++ b/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + using namespace PCIDSK; + +diff --git a/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp b/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp +index 4b7d68c..1117d68 100644 +--- a/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp ++++ b/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + using namespace PCIDSK; + +diff --git a/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp b/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp +index d7ecce5..5202256 100644 +--- a/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp ++++ b/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp +@@ -30,6 +30,7 @@ + #include "core/pcidsk_utils.h" + #include "pcidsk_exception.h" + #include ++#include + + using namespace PCIDSK; + +-- +2.45.2 diff --git a/sci-libs/gdal/patches/gdal302-3.0.2.patchset b/sci-libs/gdal/patches/gdal302-3.0.2.patchset index 83e0372ae..a32af7e36 100644 --- a/sci-libs/gdal/patches/gdal302-3.0.2.patchset +++ b/sci-libs/gdal/patches/gdal302-3.0.2.patchset @@ -1,9 +1,21 @@ -From 983af9e5699e904dde29941818cb3a0b70fe15d7 Mon Sep 17 00:00:00 2001 +From 34d60dbc79b0997f13ece1224328e8b8a773940b Mon Sep 17 00:00:00 2001 From: Begasus -Date: Thu, 4 May 2023 08:59:27 +0200 -Subject: build fix +Date: Tue, 7 Jan 2025 18:53:54 +0100 +Subject: fix for: error: 'numeric_limits' is not a member of 'std' +diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp +index 0e3c895..a407e97 100644 +--- a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp ++++ b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + //------------------------------------------------------------------------------ + // CADVector diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp index 5517c3b..9d9eeb7 100644 --- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp @@ -16,6 +28,18 @@ index 5517c3b..9d9eeb7 100644 #include #include +diff --git a/third_party/LercLib/Lerc2.h b/third_party/LercLib/Lerc2.h +index 1925c59..89dc5ae 100644 +--- a/third_party/LercLib/Lerc2.h ++++ b/third_party/LercLib/Lerc2.h +@@ -25,6 +25,7 @@ Contributors: Thomas Maurer + #define LERC2_H + + #include ++#include + #include + #include + #include -- -2.37.3 +2.45.2