Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions ports/exiv2/CONTROL

This file was deleted.

42 changes: 42 additions & 0 deletions ports/exiv2/fix-ninja-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c52b352..b19c438 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -149,7 +149,7 @@ set_target_properties( exiv2lib_int PROPERTIES

target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
target_include_directories(exiv2lib PRIVATE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
+ ${PROJECT_SOURCE_DIR}/xmpsdk/include
${ZLIB_INCLUDE_DIR}
)

@@ -215,7 +215,7 @@ else()
endif()

if( EXIV2_ENABLE_PNG )
- target_link_libraries( exiv2lib PRIVATE $<BUILD_INTERFACE:${ZLIB_LIBRARIES}>)
+ target_link_libraries( exiv2lib PRIVATE ${ZLIB_LIBRARIES})
endif()

if( EXIV2_ENABLE_NLS )
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index a22698f..ca6ffe0 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -27,13 +27,12 @@ add_library(exiv2-xmp STATIC
)

target_link_libraries(exiv2-xmp
- PRIVATE
- $<BUILD_INTERFACE:${EXPAT_LIBRARY}>
+ PRIVATE ${EXPAT_LIBRARY}
)

target_include_directories(exiv2-xmp
PRIVATE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
+ ${PROJECT_SOURCE_DIR}/xmpsdk/include
${EXPAT_INCLUDE_DIR}
)

36 changes: 28 additions & 8 deletions ports/exiv2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Exiv2/exiv2
REF 194bb65ac568a5435874c9d9d73b1c8a68e4edec #v0.27.3
SHA512 35a5a41e0a6cfe04d1ed005c8116ad4430516402b925db3d4f719e2385e2cfb09359eb7ab51853bc560138f221900778cd2e2d39f108c513b3e7d22dbb9bf503
REF 15098f4ef50cc721ad0018218acab2ff06e60beb #v0.27.4
SHA512 4be0a9c4c64c65a9ca85291ba2cf54efacc5a88dae534c2d9252986df4e12212899c33093b07695369108e3763b3d74592a6153d832743694ec95c9a03c7e2c3
HEAD_REF master
PATCHES
fix-ninja-error.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
unicode EXIV2_ENABLE_WIN_UNICODE
xmp EXIV2_ENABLE_XMP
video EXIV2_ENABLE_VIDEO
FEATURES
unicode EXIV2_ENABLE_WIN_UNICODE
xmp EXIV2_ENABLE_XMP
video EXIV2_ENABLE_VIDEO
png EXIV2_ENABLE_PNG
)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC)

if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "Feature unicode only supports Windows platform.")
endif()
Expand All @@ -24,9 +30,23 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
-DEXIV2_BUILD_EXIV2_COMMAND:BOOL=FALSE
-DEXIV2_BUILD_UNIT_TESTS:BOOL=FALSE
-DEXIV2_BUILD_SAMPLES:BOOL=FALSE
-DEXIV2_BUILD_EXIV2_COMMAND=OFF
-DEXIV2_BUILD_UNIT_TESTS=OFF
-DEXIV2_BUILD_SAMPLES=OFF
-DEXIV2_BUILD_DOC=OFF
-DEXIV2_ENABLE_EXTERNAL_XMP=OFF
-DEXIV2_ENABLE_NLS=OFF
-DEXIV2_ENABLE_PRINTUCS2=OFF
-DEXIV2_ENABLE_LENSDATA=ON
-DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC}
-DEXIV2_ENABLE_WEBREADY=OFF
-DEXIV2_ENABLE_CURL=OFF
-DEXIV2_ENABLE_SSH=OFF
-DEXIV2_ENABLE_BMFF=OFF
-DEXIV2_TEAM_EXTRA_WARNINGS=OFF
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF
-DEXIV2_TEAM_PACKAGING=OFF
-DEXIV2_TEAM_USE_SANITIZERS=OFF
)

vcpkg_install_cmake()
Expand Down
32 changes: 32 additions & 0 deletions ports/exiv2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "exiv2",
"version": "0.27.4",
"description": "Image metadata library and tools",
"homepage": "https://www.exiv2.org",
"supports": "!uwp",
"dependencies": [
"gettext",
"libiconv"
],
"features": {
"png": {
"description": "Build with png support (requires libz)",
"dependencies": [
"libpng",
"zlib"
]
},
"unicode": {
"description": "Compile with unicode support on windows"
},
"video": {
"description": "Build video support into library"
},
"xmp": {
"description": "Build with XMP metadata support",
"dependencies": [
"expat"
]
}
}
}
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1889,8 +1889,8 @@
"port-version": 4
},
"exiv2": {
"baseline": "0.27.3",
"port-version": 4
"baseline": "0.27.4",
"port-version": 0
},
"expat": {
"baseline": "2.4.1",
Expand Down Expand Up @@ -3539,8 +3539,8 @@
"libsigcpp-3": {
"baseline": "3.0.3",
"port-version": 1
},
"libsmb2": {
},
"libsmb2": {
"baseline": "2021-04-29",
"port-version": 0
},
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/exiv2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f716a33e59b24c79140216d836644fe0603e322b",
"version": "0.27.4",
"port-version": 0
},
{
"git-tree": "e38c35650c00596aafb8dda45b0d0e7f0a591563",
"version-string": "0.27.3",
Expand Down