diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-08-11 14:50:17 +0200 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-08-11 16:50:07 +0200 |
| commit | 7c4aa342167f06700262118eb2570247848ce621 (patch) | |
| tree | d22a46fa7141ebaeb05e0ac620172d1507e5d68c | |
| parent | 844df491b77304b9ef51492f670c4438064b731b (diff) | |
| download | vcpkg-7c4aa342167f06700262118eb2570247848ce621.tar.gz vcpkg-7c4aa342167f06700262118eb2570247848ce621.zip | |
[gdal] fix build with updated openjpeg
| -rw-r--r-- | ports/gdal/0004-Fix-openjpeg-include.patch | 19 | ||||
| -rw-r--r-- | ports/gdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdal/portfile.cmake | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/gdal/0004-Fix-openjpeg-include.patch b/ports/gdal/0004-Fix-openjpeg-include.patch new file mode 100644 index 000000000..2865455d8 --- /dev/null +++ b/ports/gdal/0004-Fix-openjpeg-include.patch @@ -0,0 +1,19 @@ +diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp +index 1fd4f4f..417f7a8 100644 +--- a/frmts/openjpeg/openjpegdataset.cpp ++++ b/frmts/openjpeg/openjpegdataset.cpp +@@ -29,12 +29,8 @@ + + /* This file is to be used with openjpeg 2.0 */ + +-#if 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 <stdio.h> ++#include <openjpeg.h> + #include <vector> + + #include "gdaljp2abstractdataset.h" diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 26ed0da1e..2182a3d35 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,4 +1,4 @@ Source: gdal -Version: 1.11.3-3 +Version: 1.11.3-4 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 5296b6586..96fa8fa6a 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -23,6 +23,7 @@ foreach(BUILD_TYPE debug release) ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch ${CMAKE_CURRENT_LIST_DIR}/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch + ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-openjpeg-include.patch ) endforeach() |