aboutsummaryrefslogtreecommitdiff
path: root/ports/miniz
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-06-10 17:01:54 -0700
committerGitHub <noreply@github.com>2019-06-10 17:01:54 -0700
commit3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 (patch)
tree05cb5e1338150601bfba7446839dc02863c96add /ports/miniz
parentd962dc7d651b563bed089f4bf9056003ebb7fe1c (diff)
downloadvcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.tar.gz
vcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.zip
[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24 * Update SHA512 and resolve conflict for ebml and matroska * [avro-c]Fix build error caused by jansson upgrades. * [xxhash]Update to the next version to fix build error.(xxhash issue:#179) * Fix failures and undo asio * [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches * Update REF * Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes * [flann, fastcdr] Fix old patches and build error. * [flann, fastcdr] Fix build error. * Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes * [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error. * fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi * fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers * undo libmupdf forge kd-soap qca * [mosquitto] Fix installation of import libs * [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes * [fastcdr] Minimize patch * [many ports] Revert trivial changes * [libyaml] Switch to non-dist tag * [sqlite-modern-cpp] Track master due to infrequent release * [nano-signal-slot] Revert downgrade * [openvpn3] Bump control version to account for portfile change * [sqlite-modern-cpp] Fixup wrong hash * [mosquitto] Commit missing patch
Diffstat (limited to 'ports/miniz')
-rw-r--r--ports/miniz/CMakeLists-targets.patch109
-rw-r--r--ports/miniz/CONTROL2
-rw-r--r--ports/miniz/portfile.cmake4
3 files changed, 58 insertions, 57 deletions
diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch
index 3b4c70468..c9d32e479 100644
--- a/ports/miniz/CMakeLists-targets.patch
+++ b/ports/miniz/CMakeLists-targets.patch
@@ -1,54 +1,55 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7dd6309..eaf160f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
- CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
- endif ()
-
--set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
--
- set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
-
--add_library(miniz ${miniz_SOURCE})
-+add_library(miniz STATIC ${miniz_SOURCE})
-+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
-
-+if(FALSE)
- set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
- set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
- set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
-@@ -41,12 +41,28 @@ if(${UNIX})
- target_link_libraries(example6 m)
- endif()
-
-+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
-+
- # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
- # target_link_libraries(miniz_tester miniz)
-+endif()
-
--install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
-- ARCHIVE DESTINATION lib
-- LIBRARY DESTINATION lib
-+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-+export(TARGETS ${PROJECT_NAME}
-+ NAMESPACE miniz::
-+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-+)
-+install(EXPORT ${PROJECT_NAME}Config
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
-+ NAMESPACE miniz::
-+)
- file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
--install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
-\ No newline at end of file
-+install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3e453a..094a4e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+-
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+-
++add_library(miniz STATIC ${miniz_SOURCE})
++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
++
++if(FALSE)
+ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+@@ -41,12 +40,28 @@ if(${UNIX})
+ target_link_libraries(example6 m)
+ endif()
+
++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
++
+ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+ # target_link_libraries(miniz_tester miniz)
++endif()
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
++export(TARGETS ${PROJECT_NAME}
++ NAMESPACE miniz::
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
++)
++install(EXPORT ${PROJECT_NAME}Config
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
++ NAMESPACE miniz::
++)
+ file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+ install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL
index 51a370a80..88eacdb85 100644
--- a/ports/miniz/CONTROL
+++ b/ports/miniz/CONTROL
@@ -1,3 +1,3 @@
Source: miniz
-Version: 2.0.8
+Version: 2.1.0
Description: Single C source file zlib-replacement library
diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake
index 9c67ea8c9..4de2dc3f3 100644
--- a/ports/miniz/portfile.cmake
+++ b/ports/miniz/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO richgel999/miniz
- REF 2.0.8
- SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9
+ REF a4264837ae37384b1d7a205a6732db322f0f3769
+ SHA512 88f0e03cccfe66c796db7594b93c667bd52cd7f4d13803181e9d86b4aa26f214fd2907a45a752da603d3e87f8d53c40bfc0956b279c0d49016f7b943aeb9cd33
HEAD_REF master
PATCHES
CMakeLists-targets.patch