Commit Graph

105 Commits

Author SHA1 Message Date
Kai Pastor
8fdb0f2e58
[gdal] Fix build without poppler (#30422) 2023-03-28 13:50:19 -07:00
Kai Pastor
fe2d921cd5
[gdal] Update to 3.6.3 (#30169)
* [gdal] Update to 3.6.3

* Fix poppler
2023-03-16 17:57:17 -07:00
Kai Pastor
91dd61bd44
[libwebp] Update to 1.3.0, misc changes (#29165)
* [libwebp] Update to 1.3.0

* Fix [core] on x64-osx

* Fix features and dependencies

* Cleanup tool installation

* Usage

* Lift restriction for vwebp tool

* [mapnik] Fix libwebp

* [qt5-imageformats] Use libwebp pc files

* Revert "Lift restriction for vwebp tool"

This reverts commit 42e0273f65.

* [gdal] Use upstream WebP config

* Revert no longer necessary changes to mapnik.

* Remove unnecessary patch that git checkout didn't remove.

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-27 07:25:42 -08:00
Kai Pastor
51e10eb7fe
[tiff,zstd,gdal,libkml] Fix find_package interactions, enable gdal libkml driver (#28929)
* [gdal] Fix find_package2

* [cmake-user] Test gdal

* [cmake-user] gdal needs CMake 3.9

* Fix tiff & zstd

* Update versions

* [libkml] Export modern INTERFACE_LINK_LIBRARIES

* [gdal] Enable libkml driver

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
2023-01-16 12:45:42 -08:00
Kai Pastor
94e85d15fb
[gdal] Update to 3.6.2 (#28741) 2023-01-07 01:14:04 -08:00
Kai Pastor
fa8c401dfa
[gdal] Update to 3.6.1 (#28391) 2022-12-19 14:49:05 -08:00
Kai Pastor
820f9dd784
Update to 3.6.0 (#27663) 2022-11-23 10:01:01 -08:00
Osyotr
a107236788
[gdal] Move dependencies into separate features (#27867) 2022-11-18 13:03:52 -08:00
Kai Pastor
9a7f03fa58
[gdal] Update to 3.5.3 (#27393)
* Update to 3.5.3

* Update versions
2022-11-01 19:54:40 -07:00
Matthias Kuhn
06b5f4a769
[gdal] ios compatibility (#27259) 2022-10-16 21:02:48 -07:00
Kai Pastor
1ea1da790e
[gdal] Update to v3.5.2 (#26676)
* Remove obsolete file

* Omit libspatialite on uwp [skip actions]

* Update to 3.5.2

* Update versions

* Use unofficial-libmariadb config

* Update versions

* Ensure host path setup

* Merge BUILD_TOOLS into FEATURE_OPTIONS

* Update versions

* gdal_target_interfaces must recurse

* Update versions

* CI [skip actions]

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-09-25 23:25:17 -07:00
Kai Pastor
e8f9c3391d
[gdal] Fix static windows builds, fix debug builds (#26457)
* Fix static builds

* Update versions

* Fix Qhull usage

* Update versions
2022-08-22 09:33:47 -07:00
Billy O'Neal
ae76307e4b
Audit use of TO_NATIVE_PATH. (#26201)
* Audit use of TO_NATIVE_PATH.

TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE.

Fixes https://github.com/microsoft/vcpkg/issues/26178

ports/ffmpeg/portfile.cmake:
Both uses are being embedded into a command line 

ports/gdal/dependency_win.cmake
117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate.
Drive by: Added quotes around other uses (all of which seem to be going to command lines).
202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now.

ports/msmpi/portfile.cmake
All 3 uses are being embedded into a command line 

ports/jemalloc/fix-utilities.patch
ports/libproxy/fix-dependency-libmodman.patch
ports/qtbase/env.patch
These are in upstream content / context so it is not edited.

ports/opengl/portfile.cmake
Broken! Drive by fixes:
* Modernized checking VCPKG_BUILD_TYPE
* Ordered things consistently to be release then debug.
* Removed funny newlines.

ports/openni2/portfile.cmake
Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes:
* Guarded debug-only copies for VCPKG_BUILD_TYPE
* Fixed supports expression

ports/openssl/unix/CMakeLists.txt:
Unused!

ports/pthreads/portfile.cmake:
Both uses are being embedded into a command line 

ports/qt5-base/cmake/qt_fix_makefile_install.cmake
I'm not sure if this one is OK but it's being embedded into a file so it's probably fine.

ports/qtapplicationmanager/portfile.cmake:
I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited.

ports/readosm/portfile.cmake:
The use is being embedded into a command line 

ports/spatialite-tools/portfile.cmake:
The use is being embedded into a command line 

ports/sqlcipher/portfile.cmake:
Both uses are being embedded into a command line 

scripts/ports.cmake:
Some uses were unused, others are immediately used and printed to the console. 

scripts/buildsystems/vcpkg.cmake:
Fixed :)

scripts/cmake/vcpkg_build_qmake:
Looks unused.

scripts/cmake/vcpkg_build_process.cmake:
Added to console message only. 

scripts/cmake/vcpkg_execute_required_process_repeat.cmake:
Added to console message only. 
Drive by: Fixed typo in variable name in the message.

scripts/cmake/vcpkg_execute_required_process.cmake:
Added to console message only. 

* Fix missing license.
2022-08-12 15:21:20 -07:00
autoantwort
42adffbfc7
[gdal] no absolute paths (#25804)
* [gdal] no absolute paths

* gdal no config
2022-07-19 09:58:50 -07:00
autoantwort
028fce4e88
[gdal] no absolute paths (#25778) 2022-07-15 12:19:38 -07:00
Matthias Kuhn
e3316f695b
[gdal] compatibility with 32bit devices android_api<24 (#25637) 2022-07-11 15:24:05 -07:00
Kai Pastor
a8f38e3f80
[gdal] Fix hdf5 dependency (#25646)
* Fix gdal hdf5 dependency

* Update versions
2022-07-08 10:13:10 -07:00
Kai Pastor
e6c8c2bc05
[gdal] Update to 3.5.1, build with CMake (#22392)
* Build with CMake [skip actions]

* Update to 3.5.0 RC1 [skip actions]

* Update to 3.5.0RC2

* Use GDAL_USE_INTERNAL_LIBS=OFF

* Use lower-case config path

* Add LERC support

* Fix tiff linkage in libgeotiff

* uwp is unsupported

* core doesn't imply lerc

* Drop legacy build

* Feature and portfile cleanup [skip actions]

* Cleanup wrapper

* Pass on libspatialite usage requirements

* Update versions

* Remove hfd5/netcdf from default for android

* Update versions

* Fix wrapper

* Update versions

* Fix libgeotiff config

* The wrapper needs pkgconf for libspatialite

* Update versions

* Remove obsolete patch

* Update to v3.5.1-RC1

* Burn host triplet into config, require pkg-config

* Fix libspatialite link libraries [skip actions]

* Update versions in manifests

* Update versions

* Remove obsolete wrapper code [skip actions]

Complements 5c4f512.

* Update to 3.5.1RC2 [skip actions]

* Handle additional link dependencies using pkg-config [skip actions]

* GDAL's find modules rely on PkgConfig

* Update to 3.5.1

* Update versions
2022-07-07 15:05:52 -07:00
Jack·Boos·Yu
f505ef3197
[gdal] Delete useless pdbs in lib directory (#25452)
* [gdal] Delete useless pdbs in lib directory

* version
2022-06-28 12:49:05 -07:00
Matthias Kuhn
d2f3f30607
[gdal] Fix building for 32bit Android and msvc with poppler (#25190)
* [gdal] Fix building for 32bit Android

* [gdal] Adjust poppler version

Fixes a compiler error

* [gdal] Bump port version
2022-06-15 11:17:57 -07:00
Kai Pastor
c1ee7c6ab4
[gdal] Use pkg-config to find zlib (#24931)
* Use pkg-config for zlib discovery

* Update versions
2022-05-27 16:38:28 -07:00
Kai Pastor
3b8363dd8f
[gdal] Update to 3.4.3 (#24353)
* Update to 3.4.3RC2

* Add control of AWS EC2 detection dependency

* Use libtool's DLL_EXPORT for mingw

* Move patches to vcpkg_from_github

* Update to 3.4.3

* Update versions
2022-05-06 17:13:42 -07:00
Kai Pastor
86b0ea6fe5
[gdal] Update to 3.4.2 (#23475)
* Update to 3.4.2

* Disable ATL for uwp and for arm64

* Fix linking on uwp

* Fix pc file fixup

* Update versions

* Declare dependency on atlmfc.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-03-21 14:02:46 -07:00
Kai Pastor
fb3416466f
[proj, proj4] Update to PROJ 9.0.0 & make proj the regular port (#23186)
* Update to PROJ 9.0.0 & make proj the regular port

* Consolidate files in share, move data to subdir

* Update versions

* Update proj to 9.0.0 RC2

* Add license fields

* Update versions

* Update to PROJ 9.0.0 release

* Update versions

* Update versions
2022-03-09 10:33:02 -08:00
Kai Pastor
0707a17ecf
[liblzma] No debug postfix. Rewrite wrapper. (#22856)
* Restore upstream's DLL name

* Don't add debug postfix

* Decouple wrapper from config

* Don't inject Find module stuff into config

* Cleanup

* [skip actions] Trim lzmad and LibLZMA patching

* [skip actions] Fix CMAKE_DISABLE_FIND_PACKAGE_LibLZMA

* [skip actions] CI

* Update manifests

* Update versions

* Backfill LibLZMA::LibLZMA to CMake < 3.14

* Update versions

* Update versions
2022-02-28 10:25:31 -08:00
Kai Pastor
d4422c3beb
[poppler,gdal] Major update to poppler; poppler feature for gdal (#22720)
* Major update to port poppler

* Fixup usage requirements via main pc file

* Add usage based on FindPkgConfig

* Export unofficial cmake config

* uwp is unsupported

* [gdal] Add poppler feature

* [gdal] Update poppler dependency

* [gdal] Add patch for poppler C++17 API

* Disable ENABLE_RELOCATABLE

* Update to 22.02.0 from poppler gitlab

* Update versions

* [skip actions] CI with gdal tools

* Revert "[skip actions] CI with gdal tools"

* Modify feature name for private API

* Update versions

* Add license field to gdal manifest

* Add port name to unofficial namespace

* Rectify poppler version number

* Update versions

* poppler[fontconfig] doesn't build for MSVC

* Update versions

Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
2022-02-17 17:03:04 -08:00
Kai Pastor
7be2c9dc8f
[gdal] Fix absolute paths in wrapper (#22698)
* Fixup absolute paths in wrapper

* Update versions
2022-01-25 22:47:18 -08:00
Kai Pastor
837f3aecf1
[gdal] Update to 3.4.1 (#22370)
* Update gdal to 3.4.1

* Update versions

* Explicitly disable PCRE2

* Update versions

* Revise nmake dependency import and export

* Use pkg-config for spatialite with autotools

* Update versions
2022-01-18 12:15:31 -08:00
Kai Pastor
18816d8194
[gdal] Fix configuration bug (#22322)
* Fix configuration bug

* Update versions
2022-01-04 19:45:59 -08:00
Kai Pastor
cccfe836db
[gdal] Add features for hdf5, netcdf, postgresql (#21231)
* Revise configuration, avoid hidden dependencies

* Expose hdf5 and netcdf feature, fix static linkage

* Fix hdf5 pc files

* Add spatialite flag

* Update versions

* Expose feature platform dependencies

* Update versions

* Configure gdal for windows arm and arm64

* Add postgresql feature

* Update versions

* Update wrapper

* Update versions

* Update baseline

* [skip actions] CI

* Use pkgconfig for expat

* Update versions

* uwp is unsupported (comsuppw.lib, atls.lib)

* Update versions
2022-01-03 13:08:39 -08:00
Kai Pastor
a4f322c567
[proj4] Update to 8.1.1, revise features and dependencies (#20443)
* Update to 8.1.1, cleanup patches

* Patch and use pc file installation from upstream

* Simplify dependency fixup

* Remove obsolete VCPKG_BUILD_SHARED_LIBS

* Revise feature and dependency interface

* Update versions

* Use all libs from proj.pc for gdal

* Set CMP0012 for dependency control

* Update versions

* Update versions

* Fix missing user32.lib when using libcrypto

* Update versions

* Fix missing user32.lib when using libcrypto

* Update versions
2021-12-09 18:18:18 -08:00
Kai Pastor
df8276a218
[lodepng,lodepng-c, libjxl] Update, merge lodepng-c into lodepng (#21846)
* Modernize lodepng portfile

* Update to 8c6a9e30

* Install LICENSE as copyright

* Don't install examples

* Remove unused parameter

* Merge lodepng-c into lodepng

* Add usage

* Omit lodepng-util: not official API

* Update versions

* [gdal] Don't use lz4: not a dependency

* [libjxl] Fix link flags

* Revise install cleanup, handle .dylib

* Add extra flags for uwp

* Workaround uwp toolchain quirks

* More dependency control, jxl_extras for tools only

* Pass the version to the build

* Update versions

* Skip CI for libjxl:arm-uwp

* Install usage file

* Update versions

* Use version-date for lodepng, mark lodepng-c as deprecated, and update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-06 21:51:01 -08:00
JonLiu1993
63e935d967
[gdal] Remove tool testepsg (#21816)
* [gdal] Fix tool not find

* update version
2021-12-02 19:58:12 -08:00
autoantwort
7d293602a0
[gdal] no absolute paths (#21451) 2021-11-16 16:21:16 -08:00
Kai Pastor
72059f635b
[gdal] Update to 3.4.0, minor adjustments (#21261)
* Make gdal available on arm (except windows)

* Update to 3.4.0, revise patches

* Stop importing legacy PROJ

* Update versions

* Export json-c dependency for mingw

* Update versions

Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
2021-11-13 14:43:11 -08:00
Kai Pastor
369878e686
[libgeotiff] Update to 1.7.0, revise features and config (#21253)
* Update to 1.7.0

* Refresh patches, drop fix-proj4.patch

* Restore GeoTIFF cmake package name (reverts #15750)

* Add usage (reason: #15723)

* Remove zlib dependency, transitive usage only

* Move tools to optional feature

* Modernize portfile, fix copyright

* Don't install doc and man files

* Trim main patch

* Allow reduced tiff dependencies

* Update versions

* Remove libgeotiff uwp failure from CI baseline

* Update GeoTIFF in gdal wrapper

* Update versions

* Update GeoTIFF in pdal config

* Update versions

* Switch to 'version' field

* Update versions
2021-11-10 14:54:19 -08:00
Matthias Kuhn
7b57292229
[gdal] New feature "cfitsio" (#21018)
* [gdal] New feature cfitsio

* version
2021-11-03 21:46:14 -07:00
Matthias Kuhn
39bbc76bfa
Add more debug output when finding gdal deps (#20869)
* Add more debug output when finding gdal deps

* x-add-version
2021-10-26 23:04:29 -07:00
Kai Pastor
58fbb28f94
[gdal] Workaround for vcpkg clean issue (#20890)
* Remove autotest source dir

* Update versions
2021-10-20 21:57:13 -07:00
Kai Pastor
e10f7850fe
[gdal] Update to 3.3.2 (#20765)
* Update gdal to 3.3.2, switch to github

* Don't use absl::string_view

* Update versions

* [skip actions] CI

* Mingw needs json-c

* Update versions
2021-10-19 18:26:37 -07:00
Zheng Xueke
5d191e6cb3
[gdal] add hdf5 support on windows (#20540)
* add gdal hdf5 format support on windows

* add gdal hdf5 format support on windows:run x-add-version

* remove lib EXISTS check

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* remove lib EXISTS check : fix git-tree

* Delete ports/gdal/dependency_win.cmake extra Spaces

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* delete unnecessary blank lines: update git-tree

Co-authored-by: Billy O'Neal <bion@microsoft.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
2021-10-11 10:33:21 -07:00
Matthias Kuhn
061e92ab17
[gdal] Make building executables optional (#19243)
* [gdal] Optional "tool" feature to build executables

Fixes #19189

* x-add-version

* Fix remove of tools

* Always delete the debug tools

* Add patch to make tools build optional (non-windows)

* Update patch to make tools build optional (windows)

* Update git-tree

* Update tools patch

* Update git-tree

* Revise windows tools handling

* x-add-version

* Remove empty bin dir

* Update git-tree

* Remove obsolete static tools patch

* Update git-tree

* update

* reindent

* x-add-version

* restore version

Co-authored-by: Kai Pastor <dg0yt@darc.de>
2021-09-13 14:41:20 -07:00
Kai Pastor
9f73bc1a0e
Fix target_link_libraries on repeated inclusion of wrappers (#19120)
* Fix repeated inclusion of wrappers

* x-add-version
2021-09-02 13:21:52 -07:00
Kai Pastor
bbf9b17d32
[gdal] Fix GDAL_LIBRARY passing by cache variable (#19119)
* Fix GDAL_LIBRARY passing by cache variable

* x-add-version
2021-07-26 11:11:05 -07:00
Kai Pastor
2acd21e5e8
[gdal] Repair gdal wrapper (#19105)
* Repair gdal wrapper

* x-add-version
2021-07-23 13:34:02 -07:00
Kai Pastor
4990d2b951
[gdal] Fix build for non-Windows targets (#17698)
* Remove obsolete GDAL_VERSION_LIB

* Build mingw with configure/make

* Rearrange CONF_OPTS, expose tiff dependency

* Revise linkage configuration

* Rearrange GDAL_PATCHES

* Put optional drivers into non-default feature

* Fix gdal build

* Update vcpkg.json

* Re-enable netcdf support

* Revise cmake wrapper

* Final portfile cleanup

* Remove curl osx system dependencies

* Verify configuration results before building

* Update and revise configure.ac patch

* Fix dllexport for mingw-dynamic

* Fix pc file

* Add dependencies to cmake wrapper

* Increment port-version

* x-add-version

* Fix typo

* Update git-tree

* strega-nil CRs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-23 10:38:02 -07:00
Long Huan
68fc55c971
[gdal] Update to 3.2.2 (#15292)
* update

* update

* update

* Update portfile.cmake

* update

* Revert "update"

This reverts commit 103cc600cf.

* 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-19 13:53:29 -07:00
Jack·Boos·Yu
88f0e6a94b
[vcpkg baseline][gdal] Fix configure error on OSX (#17083)
* [gdal] Fix configure error on OSX

* update version record

* Revert changes

* add touch command

* update version record
2021-04-06 12:12:53 -07:00
Jack·Boos·Yu
6d9ed56811
[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (#16904)
* [osgearth] Re-fix dependency gdal

* [gdal] Add dependency freexl on UNIX

* update version record

* fix patch

* convert to manifest

* update version record

* re-fix

* update version record

* add dependency freexl

* update version record

* Disable freexl

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Don't require freexl on Windows

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Revert osgearth change

* Fix the baseline version

* Fix osgearth baseline version

* [protouf] Automatic set protobuf_MODULE_COMPATIBLE to include the module file

* Set protobuf_MODULE_COMPATIBLE in wrapper

* Re-fix protobuf

* update version record

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-03-28 13:52:48 -07:00
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