Commit Graph

38 Commits

Author SHA1 Message Date
ankurverma85
60d7d91c71
gdal:x64-windows-static-md fixes (#15541)
* Fix windows-static builds

* Rename debug lib to comform to other naming scheme

* Update ci.baseline.txt

* Update CONTROL

* Update dependency_win.cmake

* Update portfile.cmake

* Update vcpkg-cmake-wrapper.cmake

* Update portfile.cmake

* Added versions

* Update ci.baseline.txt

* PR comments

* update gdal portversion

Co-authored-by: Ankur Verma <ankur.veram@outlook.com>
Co-authored-by: ankurv <ankurv@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2021-01-26 14:54:05 -08:00
Phoebe
46e6bad823
[gdal] Fix build errors on linux and osx (#14866) 2020-12-01 10:01:02 -08:00
Jack·Boos·Yu
fdfe770571
[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 a9ac823007

* 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-20 10:29:25 -08:00
Alexander Neumann
3a26eb3dc4
[intl/gettext/fontconfig] update to native build system (#11776)
* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2020-11-17 09:18:59 -08:00
Jack·Boos·Yu
6cc5c2c70e
[gdal] Fix debug library name in vcpkg-cmake-wrapper (#13992)
* [gdal] Fix debug library name in vcpkg-cmake-wrapper

* correct debug library name on Windows

* correct library name on Windows
2020-10-12 12:03:08 -07:00
nicole mazzuca
4cbbcbddfd
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install

* add instructions for creating a new vagrant box

* fix the vagrant scripts for the new box

* finish fixing the setup

* [mecab jxrlib] fix ports for CI

mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.

Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)

* [many ports] fix compile with Xcode 12 CLTs

This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib

* [many ports] even more Xcode 12 CLT fixes

* [jxrlib darknet] fix the last ports! (hopefully)

* CRs, plus minor wip changes to osx scripts
2020-09-24 15:15:06 -07:00
Nathan
ff0d69e3e3
[gdal] for static builds utilize static proj library (#13226) 2020-08-31 09:26:02 -07:00
NancyLi1013
d6285bc24b
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-08-17 08:33:44 -07:00
Raynor Vliegendhart
9354e0744e [proj4] Update to version 6.2.0 (#8621)
* [gdal] Change dependency from proj to proj4

* [proj4] Update to version 6.2.0
2019-10-23 15:28:46 -07:00
JackBoosY
9ff11b0d00 [gdal]Fix dependent ports in static builds. (#7434) 2019-08-19 17:10:41 -07:00
Lily
095fecf85c [gdal] Fix duplicate pdb file (#7520) 2019-08-02 10:08:00 -07:00
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports (#2933)
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
Alexander Neumann
0413c73fd7 [CURL] Remove unnecessary renaming. (#6386)
* removed unnecessary renaming.

CMake updated its module file for FindCURL. so the renaming is not required anymore.

* bump control

* fix curl in static builds

* fix gdal regression

* fix typo

* fixed alignment

* fix libideviceactivation regression

* fix idevicerestore regression
2019-05-13 08:57:55 -07:00
Daniele Lupo
e2f45664c9 [gdal] fixed compilation issue with std::fabs (#6336) 2019-05-09 15:00:16 -07:00
Jackie Ng
d70c4e356c [gdal] Fix linker error with static libpng (#6305)
* When linking gdal with static libpng, it fails because the libpng vcpkg port has references to zlib symbols that aren't present in the internal copy of zlib that gdal builds/links against.

To fix this, have the gdal port pull in a vcpkg zlib port as another dependency and have it build/link against that instead.

* [gdal]: Bump portfile version as master is already at 2.4.1-2
2019-05-06 10:44:27 -07:00
Jeremy
4c7f464233 [gdal] Add libspatialite build-dependency (#6251)
* add libspatialite for gdal

* add libspatialite

* Bump version

* Add libspatialite as feature

* Do not use gen expressions as nmake does not support
2019-05-04 18:35:25 -07:00
Victor Romero
050e71d01d
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [alac,benchmark,capnproto] Fix  check_linkage call

* [fastlz] Fix SHA512

* [coroutine] Fix dynamic build

* [folly] Find double-conversion

* [gamma] Use vcpkg_from_github

* [librsync] Enable static builds

* [netcdf-cxx4] Fix SHA512

* [octomap] Fix static build

* [tidy-html5] Fix static build

* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime

* [folly] Use ras0219's fix for link paths

* [octomap] Fix exported targets

* [uvatlas] Set tool download SHA512

* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32

* [suitesparse] osx fix

* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions

* [duktape] Resolve conflicts

* [duktape] FIxed typo in Python paths

* [wangle] Find zlib

* [openssl-uwp] Fix SHA512

* [glib] Allow static builds on non-Windows

* [suitesparse] Fix build on Windows

* [multiple ports] Bump CONTROL version

* [multiple ports] Fix description indent

* [directxtk] Fix CONTROL file

* [bde,duktape,qpid-proton] Build packages with python2 installed

* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [gdal,live555,uriparser] Fix regressions

* [live555] Update to 2019.04.24
2019-05-02 22:57:43 -07:00
wangli28
8ad2ae0d34 [gdal/pmdk]Update to new version (#6173) 2019-04-23 13:15:23 -07:00
Victor Romero
03981bb560
[gdal] Apply conditional patching (#5940) 2019-04-05 01:38:24 -07:00
Asozial
4590b6a2ff gdal: fixed typo (#5904)
* gdal: fixed typo

* Update CONTROL file
2019-04-02 10:44:46 -07:00
Joaquim
50cf58d494 Add netcdf and hdf5 dependencies (#5289)
Netcdf and HDF are important _formats_ in the scientific domains (lots of satellite data come in nc or hdf) so having them by default in GDAL seems the most natural.
2019-02-05 10:19:55 -08:00
Joaquim
2c5efa81ca [gdal] Remove libmysql dependency (#5271)
* Remove the libmysql  dependency

The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency.

```
C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse
The following packages will be built and installed:
  * gdal[core,mysql-libmysql]:x86-windows
    gmt[core]:x86-windows
  * libmysql[core]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/3: libmysql:x86-windows
Building package libmysql[core]:x86-windows...
CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message):
  Oracle has dropped support in libmysql for 32-bit Windows.
```

* Revert "Remove the libmysql  dependency"

* Remove the libmysql dependency

The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency.

```
C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse
The following packages will be built and installed:
  * gdal[core,mysql-libmysql]:x86-windows
    gmt[core]:x86-windows
  * libmysql[core]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/3: libmysql:x86-windows
Building package libmysql[core]:x86-windows...
CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message):
  Oracle has dropped support in libmysql for 32-bit Windows.
```
2019-02-01 11:01:19 -08:00
hlysunnaram
a26c95b0e3 [gdal] update to 2.4.0 (#5195)
* [gdal] update to 2.4.0 (#5132)

* [gdal] update CONTROL file (#5132)
2019-01-25 18:34:31 -08:00
hlysunnaram
38c741f390 [gdal] update port to 2.3.2 and mysql support as port feature (#4413)
* [gdal] update port from 2.3.0 to 2.3.2

* [libmariadb] fix build failure when VCPKG_BUILD_TYPE is set

* [gdal] remove libmysql dependency from port core to allow x86 build

* create new port features: mysql-libmysql and mysql-libmariadb
* add mysql-libmysql as default feature: to build on x86, install gdal[core] or gdal[core,mysql-libmariadb] if mysql support is needed
2018-10-12 15:12:15 -07:00
hlysunnaram
008c5d8668 Handle VCPKG_BUILD_TYPE (#4287)
* [curl] fix build failure when VCPKG_BUILD_TYPE is set

* [libmysql] fix build failure when VCPKG_BUILD_TYPE is set

* [openssl-windows] use VCPKG_BUILD_TYPE to build release or debug only

* [icu] use VCPKG_BUILD_TYPE to build release or debug only

* [gdal] use VCPKG_BUILD_TYPE to build release or debug only

* bump versions of curl, gdal, icu, libmysql and openssl-windows
2018-10-03 23:09:42 -07:00
Mateusz Loskot
0aad7df944 [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.
2018-05-17 23:46:04 -07:00
Robert Schumacher
d9abd619fa [gdal] Fix regression due to libmysql upgrade 2018-03-18 04:17:26 -07:00
Robert Schumacher
12ac3e9056 Merge pull request #1879 from mloskot/ml/gdal-2.2.2
[gdal] Update port to latest GDAL 2.2.2
2017-10-12 11:00:49 -07:00
Robert Schumacher
1130cc3784 [proj][proj4] Rename proj to proj4. Leave empty forwarder behind. 2017-10-02 15:54:51 -07:00
Mateusz Loskot
6df1629d4d [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
2017-09-26 19:13:28 +02:00
Albert Ziegenhagel
f2482d3af9 [gdal] fix linking to curl libraries 2017-08-16 16:32:33 +02:00
codicodi
7c4aa34216 [gdal] fix build with updated openjpeg 2017-08-11 16:50:07 +02:00
Jackie Ng
65fff24ff5 [gdal] Add dependencies for openjpeg, libwebp, libxml2 and liblzma
This enables support for 2 additional raster data formats and enables extra capabilities on certain format drivers
2017-04-29 14:38:35 +10:00
Jackie Ng
83686b514c [gdal]: Build with support for sqlite3, curl, expat, libpq and libmysql sibling ports. This activates GDAL support for 14 additional vector data formats and 6 additonal raster data formats 2017-04-29 00:54:01 +10:00
Jackie Ng
0701a70027 Light up GEOS support in GDAL 2017-04-24 05:05:05 +10:00
Robert Schumacher
fe96dcab61 [gdal] Bump version to correspond with adding external libpng dependency. 2017-01-25 17:25:56 -08:00
Manuel Massing
23ac6d0c19 [gdal] Link against external libpng 2017-01-25 08:59:40 +01:00
Manuel Massing
167f82b804 [ports] Initial commit of GDAL 1.11.3 port 2016-11-28 22:01:06 +01:00