[gdal] don't use jpeg when disabled (#33566)

This commit is contained in:
autoantwort 2023-09-06 07:42:13 +02:00 committed by GitHub
parent df2550378e
commit 6d70500536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions

13
ports/gdal/fix-jpeg.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
index 9568ef043e..94617e3ac9 100644
--- a/cmake/helpers/CheckDependentLibraries.cmake
+++ b/cmake/helpers/CheckDependentLibraries.cmake
@@ -416,7 +416,7 @@ if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)"))
"JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference"
)
endif ()
-if (TARGET JPEG::JPEG)
+if (GDAL_USE_JPEG AND TARGET JPEG::JPEG)
set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number")
mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
if (EXPECTED_JPEG_LIB_VERSION)

View File

@ -9,6 +9,7 @@ vcpkg_from_github(
fix-gdal-target-interfaces.patch
libkml.patch
Fix-quote-variable.patch
fix-jpeg.patch
)
# `vcpkg clean` stumbles over one subdir
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")

View File

@ -1,7 +1,7 @@
{
"name": "gdal",
"version-semver": "3.7.1",
"port-version": 3,
"port-version": 4,
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,

View File

@ -2790,7 +2790,7 @@
},
"gdal": {
"baseline": "3.7.1",
"port-version": 3
"port-version": 4
},
"gdcm": {
"baseline": "3.0.22",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb6b9c542c7c01651906fee737d73fab64482700",
"version-semver": "3.7.1",
"port-version": 4
},
{
"git-tree": "1bffcf8c8f2b02ed041a099723115cbbd0c39b2c",
"version-semver": "3.7.1",