aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcDc <cdc.seacave@gmail.com>2019-01-11 17:04:47 +0200
committercDc <cdc.seacave@gmail.com>2019-01-11 17:04:47 +0200
commitdffdc492710b4263cc55935b2f36bd63d504edeb (patch)
tree5a4231a7e728391a40e8d4db0da62b9236e37307
parent1fe5a31cd771313e38c46cd63ad3a33aa0acad90 (diff)
downloadvcpkg-dffdc492710b4263cc55935b2f36bd63d504edeb.tar.gz
vcpkg-dffdc492710b4263cc55935b2f36bd63d504edeb.zip
[TinyEXIF] Update to version 1.0.2
-rw-r--r--ports/tinyexif/CONTROL2
-rw-r--r--ports/tinyexif/namespace_tinyxml2.patch31
-rw-r--r--ports/tinyexif/portfile.cmake6
3 files changed, 3 insertions, 36 deletions
diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL
index ce7162ae9..259421043 100644
--- a/ports/tinyexif/CONTROL
+++ b/ports/tinyexif/CONTROL
@@ -1,4 +1,4 @@
Source: tinyexif
-Version: 1.0.1-2
+Version: 1.0.2
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..8464f2ec0 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 1.0.2
+ SHA512 956880ccd0ccdee80f438ee899c7a88e02cc3dd6f09b62cbc71b9597501f1c8e06a74cf837d3f231dbd0416c062cd05a9854f46a55671c06c01bbc9437442159
HEAD_REF master
- PATCHES
- namespace_tinyxml2.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)