diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-16 15:56:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 15:56:17 -0800 |
| commit | b6fe5b5db5bb7bfd9a3bf14cebb899fbd4c2f20a (patch) | |
| tree | 9a7a18f4d5f90d33883158575f47a0f283612fb0 | |
| parent | e8489a46c11775036f82e9f6ecc25d61feecee66 (diff) | |
| parent | 92a8da2224ada02689139a2bc910f212f48b5d57 (diff) | |
| download | vcpkg-b6fe5b5db5bb7bfd9a3bf14cebb899fbd4c2f20a.tar.gz vcpkg-b6fe5b5db5bb7bfd9a3bf14cebb899fbd4c2f20a.zip | |
Merge pull request #5127 from cdcseacave/tinyexif
[TinyEXIF] Update to version 1.0.2
| -rw-r--r-- | ports/tinyexif/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tinyexif/namespace_tinyxml2.patch | 31 | ||||
| -rw-r--r-- | ports/tinyexif/portfile.cmake | 6 |
3 files changed, 3 insertions, 36 deletions
diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index ce7162ae9..8302333d5 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.1-2 +Version: 1.0.2-4 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/namespace_tinyxml2.patch b/ports/tinyexif/namespace_tinyxml2.patch deleted file mode 100644 index d27c99c68..000000000 --- a/ports/tinyexif/namespace_tinyxml2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f22584b..1ba8329 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface - endif() - -- target_link_libraries(TinyEXIF tinyxml2) -+ target_link_libraries(TinyEXIF tinyxml2::tinyxml2) - set_target_properties(TinyEXIF PROPERTIES - COMPILE_DEFINITIONS "TINYEXIF_EXPORT" - VERSION "${GENERIC_LIB_VERSION}" -@@ -121,7 +121,7 @@ endif() - if(BUILD_STATIC_LIBS) - add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) - -- target_link_libraries(TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2) - set_target_properties(TinyEXIFstatic PROPERTIES - OUTPUT_NAME TinyEXIF - VERSION "${GENERIC_LIB_VERSION}" -@@ -162,7 +162,7 @@ if(BUILD_DEMO) - target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) - else(BUILD_STATIC_LIBS) - add_dependencies(TinyEXIFdemo TinyEXIFstatic) -- target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2) - endif() - endif() - diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 716415453..5a10d422f 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -3,11 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF 1.0.1 - SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 + REF c57a5fec1a847ec0e7b482b2da72e1f04fc2e147 + SHA512 a968e79b4b7a6f5f189328a8dc493da5c0d568526b5dca46b9bfc0cf85295fb348bd0b38828fedbb7b6e4467fc8932d0d7b435b4acbfe662e954cbed1d0ea914 HEAD_REF master - PATCHES - namespace_tinyxml2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) |