[Exiv2] update to 0.27.3 (#12278)

This commit is contained in:
JonLiu1993 2020-07-07 02:49:13 +08:00 committed by GitHub
parent 4bd7c053bb
commit 9013a281d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 65 deletions

View File

@ -1,19 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dcb98ca23..3cbd68e7e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -182,12 +182,12 @@ if (NOT MSVC)
endif()
if (CYGWIN OR MINGW OR MSYS)
- target_link_libraries( exiv2lib PRIVATE psapi ws2_32 )
+ target_link_libraries( exiv2lib PRIVATE psapi ws2_32 shell32 )
endif()
target_link_libraries( exiv2lib PRIVATE Threads::Threads)
else()
- target_link_libraries( exiv2lib PRIVATE psapi ws2_32 )
+ target_link_libraries( exiv2lib PRIVATE psapi ws2_32 shell32 )
endif()
if( EXIV2_ENABLE_PNG )

View File

@ -1,5 +1,5 @@
Source: exiv2
Version: 0.27.2-1
Version: 0.27.3
Build-Depends: zlib, expat, libiconv, gettext
Description: Image metadata library and tools
Homepage: https://www.exiv2.org

View File

@ -1,38 +0,0 @@
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index a458a0c..9caffcf 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -40,7 +40,7 @@ else()
endif()
if (EXIV2_ENABLE_NLS)
- find_package(Intl REQUIRED)
+ find_package(unofficial-gettext CONFIG)
endif( )
find_package(Iconv)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 76eaabc..68d29de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,16 +214,15 @@ if( EXIV2_ENABLE_PNG )
endif()
if( EXIV2_ENABLE_NLS )
- target_link_libraries(exiv2lib PRIVATE ${Intl_LIBRARIES})
- target_include_directories(exiv2lib PRIVATE ${Intl_INCLUDE_DIRS})
- target_include_directories(exiv2lib_int PRIVATE ${Intl_INCLUDE_DIRS})
+ target_link_libraries(exiv2lib PRIVATE unofficial::gettext::libintl)
# Definition needed for translations
target_compile_definitions(exiv2lib PUBLIC EXV_LOCALEDIR="/../${CMAKE_INSTALL_LOCALEDIR}")
endif()
-if( ICONV_FOUND )
- target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
+if(NOT TARGET unofficial::iconv::libiconv)
+ find_package(unofficial-iconv CONFIG)
endif()
+target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv )
write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)

View File

@ -1,14 +1,9 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Exiv2/exiv2
REF v0.27.2
SHA512 349063fd8ef6c44b5b2f3f68aad839271a9cb8ff206af237d28d9e9d05dcdf43b61f3232d4566780b2898d62c20134e8ea65d588a19a664c0224750e4ea1340d
REF 194bb65ac568a5435874c9d9d73b1c8a68e4edec #v0.27.3
SHA512 35a5a41e0a6cfe04d1ed005c8116ad4430516402b925db3d4f719e2385e2cfb09359eb7ab51853bc560138f221900778cd2e2d39f108c513b3e7d22dbb9bf503
HEAD_REF master
PATCHES
iconv.patch
1059-Add-missing-library-link-on-Windows.patch # https://github.com/Exiv2/exiv2/pull/1059
)
if((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND ("unicode" IN_LIST FEATURES))