diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-06-10 17:01:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 17:01:54 -0700 |
| commit | 3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 (patch) | |
| tree | 05cb5e1338150601bfba7446839dc02863c96add /ports/dcmtk | |
| parent | d962dc7d651b563bed089f4bf9056003ebb7fe1c (diff) | |
| download | vcpkg-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/dcmtk')
| -rw-r--r-- | ports/dcmtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dcmtk/dcmtk.patch | 19 | ||||
| -rw-r--r-- | ports/dcmtk/portfile.cmake | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL index ab248db1c..ad087563d 100644 --- a/ports/dcmtk/CONTROL +++ b/ports/dcmtk/CONTROL @@ -1,3 +1,3 @@ Source: dcmtk
-Version: 3.6.3-1
+Version: 3.6.4 Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
diff --git a/ports/dcmtk/dcmtk.patch b/ports/dcmtk/dcmtk.patch index c25a8db7b..cca14e28e 100644 --- a/ports/dcmtk/dcmtk.patch +++ b/ports/dcmtk/dcmtk.patch @@ -1,15 +1,16 @@ -diff --git "a/CMake/dcmtkPrepare.cmake" "b/CMake/dcmtkPrepare.cmake" ---- a/CMake/dcmtkPrepare.cmake 2018-02-05 12:58:13.000000000 -0500 -+++ b/CMake/dcmtkPrepare.cmake 2018-04-25 15:07:12.927851000 -0400 -@@ -192,9 +192,9 @@ +diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake +index e9f77b5..4f7ebe3 100644 +--- a/CMake/dcmtkPrepare.cmake ++++ b/CMake/dcmtkPrepare.cmake +@@ -192,9 +192,9 @@ include(GNUInstallDirs) # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed # to different installation paths under Unix- and Windows-based systems - IF(UNIX) -- SET(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk") + if(UNIX) +- set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk") + SET(DCMTK_INSTALL_CMKDIR "share/dcmtk") - ELSEIF(WIN32) -- SET(DCMTK_INSTALL_CMKDIR "cmake") + elseif(WIN32) +- set(DCMTK_INSTALL_CMKDIR "cmake") + SET(DCMTK_INSTALL_CMKDIR "share/dcmtk") - ENDIF(UNIX) + endif() #----------------------------------------------------------------------------- diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index d11878a0e..cdf9b73e6 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk - REF DCMTK-3.6.3 - SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d + REF 1967b13134308f311e6a827e616958c6a4da5bc9 + SHA512 a63a773e339081720adb0f3260a3b21ee11cde8009b321c3f45eeb40402ff29bd580926fb44f0dd784ba8369e2597933196bdaa324517d91fa5201b11b7504c0 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch ) |