mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[exiv2] update to 0.28.1 and fix build error (#35020)
* [exiv2] update to 0.28.1 * update version * Fix option * update version --------- Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
This commit is contained in:
parent
67e861818a
commit
6b07285422
@ -1,10 +1,10 @@
|
||||
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
|
||||
index 664522c2a..cbfa5d908 100644
|
||||
index 67a6cfd..d5006ff 100644
|
||||
--- a/cmake/findDependencies.cmake
|
||||
+++ b/cmake/findDependencies.cmake
|
||||
@@ -30,10 +30,12 @@ endif()
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
|
||||
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
|
||||
|
||||
+if(EXIV2_BUILD_UNIT_TESTS)
|
||||
find_package (Python3 COMPONENTS Interpreter)
|
||||
@ -13,5 +13,5 @@ index 664522c2a..cbfa5d908 100644
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
find_package(Filesystem REQUIRED)
|
||||
find_package(Filesystem COMPONENTS Experimental Final REQUIRED)
|
||||
|
||||
|
@ -1,9 +1,8 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 41a672e8..1311c856 100644
|
||||
index 85dd6cd..4967d8a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -182,7 +182,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE
|
||||
)
|
||||
@@ -178,7 +178,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE
|
||||
|
||||
if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
|
||||
target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR})
|
||||
@ -12,17 +11,15 @@ index 41a672e8..1311c856 100644
|
||||
list(APPEND requires_private_list "expat")
|
||||
endif()
|
||||
|
||||
if (EXIV2_ENABLE_XMP)
|
||||
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
|
||||
index 9c148a61..0fed7cde 100644
|
||||
index 87c59c0..d2f23e6 100644
|
||||
--- a/xmpsdk/CMakeLists.txt
|
||||
+++ b/xmpsdk/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ add_library(exiv2-xmp OBJECT
|
||||
|
||||
target_link_libraries(exiv2-xmp
|
||||
PRIVATE
|
||||
- EXPAT::EXPAT
|
||||
+ expat::expat
|
||||
@@ -31,6 +31,7 @@ target_include_directories(exiv2-xmp SYSTEM
|
||||
${PROJECT_SOURCE_DIR}/xmpsdk/include
|
||||
${EXPAT_INCLUDE_DIRS}
|
||||
)
|
||||
+target_link_libraries(exiv2-xmp PRIVATE expat::expat)
|
||||
|
||||
target_include_directories(exiv2-xmp SYSTEM
|
||||
# Prevent a denial-service-attack related to XML entity expansion
|
||||
# ("billion laughs attack").
|
||||
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Exiv2/exiv2
|
||||
REF "v${VERSION}"
|
||||
SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad
|
||||
SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-find_expat.patch
|
||||
@ -10,13 +10,11 @@ vcpkg_from_github(
|
||||
fix-brotli.patch
|
||||
fix-expat.patch
|
||||
dont-find-python.patch
|
||||
ios.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
xmp EXIV2_ENABLE_XMP
|
||||
video EXIV2_ENABLE_VIDEO
|
||||
png EXIV2_ENABLE_PNG
|
||||
nls EXIV2_ENABLE_NLS
|
||||
bmff EXIV2_ENABLE_BMFF
|
||||
@ -39,6 +37,7 @@ vcpkg_cmake_configure(
|
||||
-DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC}
|
||||
-DEXIV2_ENABLE_WEBREADY=OFF
|
||||
-DEXIV2_ENABLE_CURL=OFF
|
||||
-DEXIV2_ENABLE_VIDEO=OFF
|
||||
-DEXIV2_TEAM_EXTRA_WARNINGS=OFF
|
||||
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF
|
||||
-DEXIV2_TEAM_PACKAGING=OFF
|
||||
@ -46,7 +45,7 @@ vcpkg_cmake_configure(
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/exiv2)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/exiv2)
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
configure_file(
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "exiv2",
|
||||
"version": "0.28.0",
|
||||
"port-version": 1,
|
||||
"version": "0.28.1",
|
||||
"description": "Image metadata library and tools",
|
||||
"homepage": "https://exiv2.org",
|
||||
"license": "GPL-2.0-or-later",
|
||||
@ -49,7 +48,7 @@
|
||||
]
|
||||
},
|
||||
"video": {
|
||||
"description": "Build video support into library"
|
||||
"description": "Deprecated. it will be removed in the future."
|
||||
},
|
||||
"xmp": {
|
||||
"description": "Build with XMP metadata support",
|
||||
|
@ -2473,8 +2473,8 @@
|
||||
"port-version": 7
|
||||
},
|
||||
"exiv2": {
|
||||
"baseline": "0.28.0",
|
||||
"port-version": 1
|
||||
"baseline": "0.28.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"expat": {
|
||||
"baseline": "2.5.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0c1020def33eb27e28b1cb0bd2cfd53dfe5fbae5",
|
||||
"version": "0.28.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "550a17385502e498859987df6696ffdccc55190d",
|
||||
"version": "0.28.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user