mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 09:09:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
96680fe97e
vcpkg/ports/gdal/0004-Fix-cfitsio.patch

14 lines
329 B
Diff
Raw Normal View History

[gdal] Update to 3.1.3 (#13449) * [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-21 02:29:25 +08:00
diff --git a/frmts/fits/fitsdataset.cpp b/frmts/fits/fitsdataset.cpp
[gdal] Update to 3.2.2 (#15292) * update * update * update * Update portfile.cmake * update * Revert "update" This reverts commit 103cc600cfee1c20544db11459811e1edffbc98e. * update * Update portfile.cmake * update * update * update * update * update * update * update * fix linux build * fix linux libxml2 error * Update gdal.json * Update ports/gdal/vcpkg.json * update version record * update gdal to 3.2.2 * update version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-04-20 04:53:29 +08:00
index c3f4a4e1f..eb29a92b1 100644
[gdal] Update to 3.1.3 (#13449) * [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-21 02:29:25 +08:00
--- a/frmts/fits/fitsdataset.cpp
+++ b/frmts/fits/fitsdataset.cpp
[gdal] Update to 3.2.2 (#15292) * update * update * update * Update portfile.cmake * update * Revert "update" This reverts commit 103cc600cfee1c20544db11459811e1edffbc98e. * update * Update portfile.cmake * update * update * update * update * update * update * update * fix linux build * fix linux libxml2 error * Update gdal.json * Update ports/gdal/vcpkg.json * update version record * update gdal to 3.2.2 * update version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-04-20 04:53:29 +08:00
@@ -38,7 +38,7 @@
#include "ogrsf_frmts.h"
[gdal] Update to 3.1.3 (#13449) * [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-21 02:29:25 +08:00
#include <string.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
[gdal] Update to 3.2.2 (#15292) * update * update * update * Update portfile.cmake * update * Revert "update" This reverts commit 103cc600cfee1c20544db11459811e1edffbc98e. * update * Update portfile.cmake * update * update * update * update * update * update * update * fix linux build * fix linux libxml2 error * Update gdal.json * Update ports/gdal/vcpkg.json * update version record * update gdal to 3.2.2 * update version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-04-20 04:53:29 +08:00
#include <algorithm>
[gdal] Update to 3.1.3 (#13449) * [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-11-21 02:29:25 +08:00
#include <string>
Reference in New Issue Copy Permalink