Commit Graph

52 Commits

Author SHA1 Message Date
Joachim Gehweiler
0ff75ac80b
[vcpkg] Fix more cases of semicolon mishandling in "scripts" - follow-up to PR #12926 (#13968) 2020-10-26 19:30:27 -07: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
Oskari Timperi
b5f00aefc9
[geos] Update to 3.8.1 (#12163) 2020-08-31 17:45:58 -07:00
Nathan
ff0d69e3e3
[gdal] for static builds utilize static proj library (#13226) 2020-08-31 09:26:02 -07:00
Phoebe
791a18385a
[gdal] Fix static build issue (#12541) 2020-08-21 15:44:23 -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
Alexander Neumann
bdae0904c4 [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d (#8566)
* [ports] Update openssl-unix to 1.1.1c

* [ports] Update openssl-unix to 1.1.1d

* [ports] openssl-unix platform 'AMD64' is called 'x86_64' on Linux

* [ports] fix openssl platform

* [ports] openssl-windows update openssl to 1.1.1d

* [ports] Fix openssl post build

* [ports] openssl add EnableUWPSupport.patch

Reference:
https://github.com/openssl/openssl/pull/8917
https://github.com/openssl/openssl/pull/9440

* [ports] openssl-uwp update openssl to 1.1.1d

* Updated support for OpenSSL v1.1

With OpenSSL v1.1 we need an additional flag for ACE

* update to 12.0 and change to vcpkg_configure_make

* remove msys line

* remove custom cmakelists

* use --without-readline on linux

* Update CONTROL

Fix version

* fix portfile

* add all possible libpq features

* create vcpkg_get_build_depends

* create vcpkg_read_dependent_port_info

* add vcpkg_write_port_info

* fix a few bugs

* libpq first succesful x86 build with core features.
(files still must be moved)

* always write the variable

* Fix separate make and install execution error issue.

* trigger CI system.

* add openssl and win_bison win_flex patch

* add configuration dependent patches

* add bonjour as a dependency on macosx

* apply patches and configure features

* more patches to fix the windows build

* more install fixes

* remove unnecessary code

* bit of code cleanup

* remove unrelated files

* remove unrelated function call. function was removed with last commit

* removed hardcoded platform

* fix patch

* build only the interface libraries and nothing more

* forgot to remove tool ecpg from install

* seperate minimal install patch from normal install patch and introduce client feature

* fix x86 Platform variable being x86 and not Win32 as required by the generated project

* make linux build work

* make more linux work

* openssl return version number directly without calling openssl
(should probably be done differently)

* fix some more path and platform identification

* comments to reduce install. currently libpq installs static and shared libraries and some tools on linux

* patch arm

* fix platform detection logic

* make libpq osx buildable

* Rename debug import library after build.
(So that we don't affect external CMake users.)

* revert debug naming and install a wrapper instead.

* fix gdal regression due to name change

* fix cutelyst regression due to qt5-base wrapper
(why was it not using the target in the first place?)

* correct wrapper install path

* correct the arm patch.

* trying to fix static gdal build

* gdal still needs more work

* update version of openssl in libpq openssl patch

* nmap fix openssl

* qt5 fix openssl

* gdal fix openssl

* librtmp migrate to openssl 1.1.1

* fail in patch since what is intended is not going to work in openssl 1.1.1

* fix static yara build

* freedtds deactivate openssl feature until freetds decides to upgrade to 1.1

* fix libwebsockets cmakelists

* fix the patch so that the generated targets also include crypt32

* xmlsec add threads dependency

* bump control since I am unable to reproduce the regression

* add pthread to openssl detection logic

* fix freetds linkage missing crypt32 and fix the cmake checks.

* fix the openssl wrapper to add the threads library

* fix libmysql regression

* add threads to openssl libraries.

* upgrade libssh to 0.9

* fix nmap regression

* fix mosquitto regression

* fix openssl wrapper to make libarchive work

* fix quickfix

* changed patch a bit

* improve freetds patch

* fix case in librtmp

* update control

* bump control

* fix case

* make jasper a dependency of qt5-imageformats to fix flaky CI build.

* add jasper libraries explicitly

* jasper depends on freeglut so add it as a dependency. turbo_jpeg is also a dependency but that should already be handled in qt5-base

* more glut names

* bump control for macosx ci retry

* fix slikenet regression

* fix linebreak in qt5-base

* update baseline

* Update ci.baseline.txt

those ports are not supported on UWP

* [libevent] add dependency on libevent[threads] to openssl feature

* [pdal,freerdp] Update CI baseline to fail

* fix static pdal build

* fix freerdp on linux

* trying to revert some changes

* revert changes in build make

* revert x264 version bump

Co-authored-by: Force Charlie <6904176+fcharlie@users.noreply.github.com>
Co-authored-by: Johnny Willemsen <jwillemsen@remedy.nl>
Co-authored-by: Lennart Trunk <lennart.trunk@outlook.de>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
2020-01-13 15:43:36 -08: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
75dd38cd8a [proj4] Upgrade version to 6.1.1 and remove patches. (#7917)
* [proj4]Upgrade version to 6.1.1 and remove useless patches.

* [libgeotiff]Fix build errors using proj4 6.1.1.

* [libspatialite]Fix build errors using proj4 6.1.1.

* [gdal]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [libgeotiff]Re-fix build errors using proj4 6.1.1.

* [vtk]Fix build errors using proj4 6.1.1.

* [proj4]Fix find sqlite binary failure.

* [proj4]Disable build tools when building proj4 in arm/uwp.

* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

* add back dl libs

* [gdal]Fix dependent port proj library name.

* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [proj4]Fix feature database on triplet arm/uwp.

* [gdal]Remove useless flag PROJ_STATIC.

* [proj4]Fix build error on x64-windows-static.

* [liblas]Use find_library to get proj4/sqlite3 libraries.

* [proj4]Fix sqlite dependency.

* [proj4]Fix arm/uwp dependency.

* [proj4]Fix linux build: configure error.

* [proj4]Disable export proj4 namespace.

* [liblas]Delete proj dependency.

* [libspatialite]Fix linux build.

* [libspatialite]Fix linux command.

* [libspatialite]Fix configure error.

* [proj4]fix static cmake tools path.

* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

* [vtk]Fix using latest proj4 issue.

* [proj4]Delete missing patch.
2019-10-17 17:15:52 -07:00
lakinwecker
453ffa5aad Speed up the gdal build by using all available cores for make. (#8375)
* Speed up the gdal build by using all available cores for make.

* Also build the debug build with all cores.

* Addresses the review comments.

Use VCPKG_CONCURRENCY so the normal vcpkg concurrency controls apply.
Use vcpkg_execute_build_process and NO_PARALLEL_COMMAND which allows
for builds to be retried in some cases where parallel builds might fail.
2019-09-28 11:32:15 -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
Stefano Sinigardi
5898891125 [openexr,openimageio,suitesparse,theia] updates for non-win32 (#6371)
* [openexr,openimageio,suitesparse,theia] updates for non-win32

* [theia] use only valid cmake symbols

* [suitesparse] Fix build

* [lapack] still not properly integrating with other ports

* [lapack] intercept cmake module calls and substitute them with our defs

* [suitesparse,clapack] fixes for proper integration

* [ceres,clapack] bump CONTROL

* [suitesparse] remove unnecessary defs

* [clapack] improve wrapper logic

* [WIN32] remove wrong symbol

* [clapack] fix wrapper integration

* [Accelerate] use best framework when available

* [clapack] separate config from wrapper

* [clapack] fix paths and filenames

* [mlpack,armadillo,clapack] improve library handling

* [mlpack] remove unnecessary cmake option

* [clp,coinutils,osi,liblemon] dependencies of openmvg, improve compatibility with non-win32

* [openmvg] fix for case-sensitive filesystems

* [clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps

* [sophus] Force rebuild

* [theia] fixes for linux, part1

* [io2d] remove broken sintax

* [fontconfig] bump version to remove CI cached failure

* [theia] fixes for linux, part2

* [theia] remove unnecessary empty folders and comments from portfile

* [theia] use correct build type removing forced vars in cmakelists.txt

* [openmvg] add missing suitesparse target detection

* [sophus] fix Suitesparse dependency

* [sophus,openmvg] use suitesparse lowercase for module compatibility on case-sensitive filesystems

* [suitesparse] fixes for case-sensitive filesystems

* [openmvg] use correct Eigen3 name for case-sensitive filesystems

* [sophus] trigger rebuild

* [shogun] use modern vcpkg style

* [shogun] add missing cmake system processor symbol
2019-05-31 15:48:17 -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
JackBoosY
14bfca23c5 [gdal]Add Linux/Unix support. (#6335) 2019-05-10 13:07:14 -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
JuttaAnders
6f0923ae93 Fix for shared build broken due to #5839 (#5882) 2019-03-31 09:32:29 -07:00
JuttaAnders
c88974a223 [gdal] fix for building static library (#5839) 2019-03-27 11:47:15 -07:00
shelltdf
99ec372755 install gdal tools (#5644) 2019-03-12 15:58:40 -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
Robert Schumacher
ff659ef957 [gdal] Fix build failure in finding license file 2018-10-25 10:28:09 -07: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
Mateusz Loskot
793019b9cd [GEOS] Generate debug library names with d suffix (#3371)
* [GEOS] Generate debug library names with `d` suffix

Currently geos.lib name is used for both, debug and optimised
GEOS libraries. This leads to situation when:
```
find_library(GEOS_LIBRARY_DEBUG NAMES geos)
find_library(GEOS_LIBRARY_RELEASE NAMES geos)
```

finds the same library for both
```
GEOS_LIBRARY_DEBUG=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
GEOS_LIBRARY_RELEASE=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
```

This is minimal patch that works around the problem.

Next, complete fix should be submitted to GEOS upstream,
preferably using exported targets.

* [libspatialite] Add missing geos suffixes in static builds
2018-05-01 01:14:18 -07:00
Robert Schumacher
d9abd619fa [gdal] Fix regression due to libmysql upgrade 2018-03-18 04:17:26 -07:00
Robert Schumacher
e033dcd649 [gdal] Add early checks for incompatible target settings 2018-02-27 10:14:30 -08: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
Robert Schumacher
55605c73e0 [gdal] Use CURRENT_INSTALLED_DIR instead of calculating it out. Use VCPKG_TARGET_ARCHITECTURE instead of parsing the triplet. 2016-12-06 00:57:58 -08:00
Manuel Massing
05f9b3a164 [gdal] Rename dynamic gdal libraries to match static library naming, add "d" suffix for debug libraries 2016-11-30 10:38:56 +01:00
Manuel Massing
e3001c78b9 [gdal] Enable building of PDBs in release builds as well, copy PDBs over 2016-11-30 10:38:56 +01:00