diff options
| author | Mateusz Loskot <mateusz@loskot.net> | 2018-05-18 08:46:04 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-17 23:46:04 -0700 |
| commit | 0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9 (patch) | |
| tree | 044e32caed18691afed511ab7dd8109b4db7faba /ports/gdal/0003-Fix-openjpeg-include.patch | |
| parent | 2978f18ad33b138581d06badae64ad08fdff4653 (diff) | |
| download | vcpkg-0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9.tar.gz vcpkg-0aad7df94445ea0eb8d6dfe3acf07fac9a4e9fa9.zip | |
[GDAL] Update to 2.3.0 (#3478)
Update portfile.cmake for easier version/checksum maintenance.
Update and rename 0001 patch fixing debug build.
Update no-my-bool.patch following source file changes.
Remove no patches which are no longer required due to corresponding
changes in the GDAL source code.
Supports PROJ 4.9.x and 5.x - the latter not in vcpkg ports.
Diffstat (limited to 'ports/gdal/0003-Fix-openjpeg-include.patch')
| -rw-r--r-- | ports/gdal/0003-Fix-openjpeg-include.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ports/gdal/0003-Fix-openjpeg-include.patch b/ports/gdal/0003-Fix-openjpeg-include.patch deleted file mode 100644 index 4ea72690c..000000000 --- a/ports/gdal/0003-Fix-openjpeg-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 |