cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-23 19:29:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[exiv2] Update library to 0.27.2 (#7992)

Browse Source
This commit is contained in:
Ehsan 2019-09-04 03:35:18 +04:30 committed by Griffin Downs
parent e99a3f9132
commit a8d8d50ecf
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/exiv2/CONTROL
View File

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

18
ports/exiv2/iconv.patch
View File

@ -1,23 +1,27 @@
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index a458a0c..9caffcf 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -36,5 +36,5 @@
@@ -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 91469b6..4c51068 100644
index 76eaabc..68d29de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -208,14 +208,14 @@
@@ -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}")
@ -25,12 +29,10 @@ index 91469b6..4c51068 100644
-if( ICONV_FOUND )
- target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
-endif()
+if(NOT TARGET unofficial::iconv::libiconv)
+ find_package(unofficial-iconv CONFIG)
+endif()
endif()
+target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv )
write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)

11
ports/exiv2/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Exiv2/exiv2
REF 0.27.1
SHA512 1b637138cee019122d98ae3c54e84416ba1a90531b3f541748697c9f1a8faee18699f10cef5a63bf60b8588e8c670925cbac3ad6c82e41160442f8a66380d407
REF v0.27.2
SHA512 349063fd8ef6c44b5b2f3f68aad839271a9cb8ff206af237d28d9e9d05dcdf43b61f3232d4566780b2898d62c20134e8ea65d588a19a664c0224750e4ea1340d
HEAD_REF master
PATCHES
iconv.patch
@ -24,11 +24,10 @@ vcpkg_configure_cmake(
-DEXIV2_BUILD_EXIV2_COMMAND:BOOL=FALSE
-DEXIV2_BUILD_UNIT_TESTS:BOOL=FALSE
-DEXIV2_BUILD_SAMPLES:BOOL=FALSE
# -DEXIV2_ENABLE_NLS:BOOL=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/exiv2/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/exiv2)
configure_file(
${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
@ -47,5 +46,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
endif()
# Handle copyright
file(COPY ${SOURCE_PATH}/ABOUT-NLS DESTINATION ${CURRENT_PACKAGES_DIR}/share/exiv2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/exiv2/ABOUT-NLS ${CURRENT_PACKAGES_DIR}/share/exiv2/copyright)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/exiv2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/exiv2/COPYING ${CURRENT_PACKAGES_DIR}/share/exiv2/copyright)