Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381

3 files changed, 5 insertions, 51 deletions

diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index 798343c70..14be794c7 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,6 +1,6 @@
 Source: exiv2
 Version: 0.27.3
-Port-Version: 1
+Port-Version: 2
 Build-Depends: zlib, libiconv, gettext
 Description: Image metadata library and tools
 Homepage: https://www.exiv2.org
@@ -12,3 +12,6 @@ Description: Compile with unicode support on windows
 Feature: xmp
 Description: Build with XMP metadata support
 Build-Depends: expat
+
+Feature: video
+Description: Build video support into library
diff --git a/ports/exiv2/expat.patch b/ports/exiv2/expat.patch
deleted file mode 100644
index a170e61dc..000000000
--- a/ports/exiv2/expat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake

-index 9caffcf..deb01a0 100644

---- a/cmake/findDependencies.cmake

-+++ b/cmake/findDependencies.cmake

-@@ -33,7 +33,7 @@ if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)

-     message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive.  You can only choose one of them")

- else()

-     if (EXIV2_ENABLE_XMP)

--        find_package(EXPAT REQUIRED)

-+        find_package(expat CONFIG REQUIRED)

-     elseif (EXIV2_ENABLE_EXTERNAL_XMP)

-         find_package(XmpSdk REQUIRED)

-     endif ()

-diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt

-index ae011dc..7390d26 100644

---- a/xmpsdk/CMakeLists.txt

-+++ b/xmpsdk/CMakeLists.txt

-@@ -26,16 +26,21 @@ add_library(exiv2-xmp STATIC

-     include/XMP_Version.h

- )

- 

--target_link_libraries(exiv2-xmp

--    PRIVATE 

--        ${EXPAT_LIBRARY}

--)

-+if(WIN32 AND NOT MINGW)

-+    target_link_libraries(exiv2-xmp

-+        PRIVATE 

-+            expat::libexpat

-+    )

-+else()

-+    target_link_libraries(exiv2-xmp

-+        PRIVATE 

-+            expat::expat

-+    )

-+endif()

- 

- target_include_directories(exiv2-xmp

-     PUBLIC 

-         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>

--    PRIVATE 

--        ${EXPAT_INCLUDE_DIR}

- )

- 

- # Prevent a denial-service-attack related to XML entity expansion

diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index faab7e405..262be9d35 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -1,22 +1,18 @@
 #https://github.com/Exiv2/exiv2/issues/1063
 vcpkg_fail_port_install(ON_TARGET "uwp")
 
-if("xmp" IN_LIST FEATURES)
-    set(EXPAT_PATCH ${CMAKE_CURRENT_LIST_DIR}/expat.patch)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
     REF 194bb65ac568a5435874c9d9d73b1c8a68e4edec #v0.27.3
     SHA512 35a5a41e0a6cfe04d1ed005c8116ad4430516402b925db3d4f719e2385e2cfb09359eb7ab51853bc560138f221900778cd2e2d39f108c513b3e7d22dbb9bf503
     HEAD_REF master
-    PATCHES ${EXPAT_PATCH}
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     unicode EXIV2_ENABLE_WIN_UNICODE
     xmp     EXIV2_ENABLE_XMP
+    video   EXIV2_ENABLE_VIDEO
 )
 
 if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)