mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 11:49:05 +08:00
[gdal] fix build with updated openjpeg
This commit is contained in:
parent
844df491b7
commit
7c4aa34216
19
ports/gdal/0004-Fix-openjpeg-include.patch
Normal file
19
ports/gdal/0004-Fix-openjpeg-include.patch
Normal file
@ -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"
|
@ -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
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user