* 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
This commit is contained in:
Kai Pastor 2022-05-07 02:13:42 +02:00 коммит произвёл GitHub
Родитель 24ed115a89
Коммит 3b8363dd8f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 27 добавлений и 25 удалений

Просмотреть файл

@ -7,7 +7,7 @@ index 98805cf..a6a1846 100644
#ifndef CPL_DLL
-#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL)
+#if defined(WIN32) && !defined(CPL_DISABLE_DLL)
+#if defined(WIN32) && (!defined(CPL_DISABLE_DLL) || defined(DLL_EXPORT))
# ifdef GDAL_COMPILATION
# define CPL_DLL __declspec(dllexport)
# else

Просмотреть файл

@ -1,24 +1,19 @@
set(GDAL_PATCHES
0001-Fix-debug-crt-flags.patch
0002-Fix-build.patch
0004-Fix-cfitsio.patch
0005-Fix-configure.patch
0007-Control-tools.patch
0008-Fix-absl-string_view.patch
0009-atlbase.patch
0010-symprefix.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/gdal
REF v3.4.2
SHA512 4dadfaefb4924e17395b2d8b695e185e91e9ad28b4b8666b64f11f40164411974f8ade747592060b515907ee73bf335610698c5e53e56a8937a89ddfffc3d66b
REF v3.4.3
SHA512 702bcb220abc7cf978e8f70a1b2835a20ce5abe405014b9690cab311c00837e57555bb371ff5e2655f9eed63cfd461d6cec5e654001b276dd79a6d2ec0c21f0b
HEAD_REF master
PATCHES ${GDAL_PATCHES}
PATCHES
0001-Fix-debug-crt-flags.patch
0002-Fix-build.patch
0004-Fix-cfitsio.patch
0005-Fix-configure.patch
0006-Fix-mingw-dllexport.patch
0007-Control-tools.patch
0008-Fix-absl-string_view.patch
0009-atlbase.patch
0010-symprefix.patch
)
# `vcpkg clean` stumbles over one subdir
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
@ -54,7 +49,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib")
endif()
if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
if(NOT "aws-ec2-windows" IN_LIST FEATURES)
list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO")
endif()

Просмотреть файл

@ -1,14 +1,10 @@
{
"name": "gdal",
"version-semver": "3.4.2",
"version-semver": "3.4.3",
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,
"dependencies": [
{
"name": "atlmfc",
"platform": "windows & !uwp"
},
"curl",
"expat",
"geos",
@ -45,6 +41,12 @@
"supported-default-features"
],
"features": {
"aws-ec2-windows": {
"description": "Optimized detection of AWS EC2 Windows hosts",
"dependencies": [
"atlmfc"
]
},
"cfitsio": {
"description": "Enable cfitsio support",
"dependencies": [

Просмотреть файл

@ -2429,7 +2429,7 @@
"port-version": 0
},
"gdal": {
"baseline": "3.4.2",
"baseline": "3.4.3",
"port-version": 0
},
"gdcm": {

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8277225a2c5da40e154062f73526126fb00c9125",
"version-semver": "3.4.3",
"port-version": 0
},
{
"git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3",
"version-semver": "3.4.2",