diff options
| author | Mateusz Loskot <mateusz@loskot.net> | 2017-09-26 19:13:28 +0200 |
|---|---|---|
| committer | Mateusz Loskot <mateusz@loskot.net> | 2017-09-26 19:13:28 +0200 |
| commit | 6df1629d4dccb5a580e7d3de407cc9d932bfd5e7 (patch) | |
| tree | 3d0ab3d43af3e60cfa2a525b0cee23aba13c9333 /ports/gdal/0003-Fix-openjpeg-include.patch | |
| parent | 084b1afe9af1690916fab95bbb80c6891109f0fc (diff) | |
| download | vcpkg-6df1629d4dccb5a580e7d3de407cc9d932bfd5e7.tar.gz vcpkg-6df1629d4dccb5a580e7d3de407cc9d932bfd5e7.zip | |
[gdal] Update port to latest GDAL 2.2.2
* Bump GDAL version wherever necessary
* Update download package and checksum.
* Remove 0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch
no longer necessary.
* Recalculate 000N prefix in patche filenames after the removal.
* Update 0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
* Patch pushed upstream https://trac.osgeo.org/gdal/ticket/7055
and should no longer be necessary in GDAL 2.2.3 or later
* Update 0003-Fix-openjpeg-include.patch
Diffstat (limited to 'ports/gdal/0003-Fix-openjpeg-include.patch')
| -rw-r--r-- | ports/gdal/0003-Fix-openjpeg-include.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ports/gdal/0003-Fix-openjpeg-include.patch b/ports/gdal/0003-Fix-openjpeg-include.patch new file mode 100644 index 000000000..4ea72690c --- /dev/null +++ b/ports/gdal/0003-Fix-openjpeg-include.patch @@ -0,0 +1,20 @@ +diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp +index 5978882bc9..72cc7b9559 100644 +--- a/frmts/openjpeg/openjpegdataset.cpp ++++ b/frmts/openjpeg/openjpegdataset.cpp +@@ -34,14 +34,8 @@ + #pragma clang diagnostic ignored "-Wdocumentation" + #endif + +-#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200 +-#include <openjpeg-2.2/openjpeg.h> +-#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100 +-#include <openjpeg-2.1/openjpeg.h> +-#else + #include <stdio.h> /* openjpeg.h needs FILE* */ +-#include <openjpeg-2.0/openjpeg.h> +-#endif ++#include <openjpeg.h> + + #ifdef __clang__ + #pragma clang diagnostic pop |