From ee51cc23468d183cc685aae33dc2ad3ce91fec8d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 23 Jul 2022 02:07:51 +0800 Subject: [PATCH] [DCMTK] update to 3.6.7 (#25887) * [DCMTK] update to 3.6.7 * update version * Add license * update version --- ports/dcmtk/portfile.cmake | 5 ++--- ports/dcmtk/vcpkg.json | 5 +++-- versions/baseline.json | 4 ++-- versions/d-/dcmtk.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 7e792dfed6..1444a40ab2 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk - REF 6cb30bd7fb42190e0188afbd8cb961c62a6fb9c9 # DCMTK-3.6.6 - SHA512 3fbd524bc0b9dced2cdddca850c88d8785ca5f333c5f1598ffbffb8e5c33d11eebdce9ed935245048ac45a7ccd7bd9e4ca79eaacf752cba64a5534b76e5efcdb + REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7 + SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch ) @@ -21,7 +21,6 @@ vcpkg_cmake_configure( -DDCMTK_WITH_ICONV=OFF -DDCMTK_FORCE_FPIC_ON_UNIX=ON -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF - -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON -DDCMTK_ENABLE_PRIVATE_TAGS=ON -DBUILD_APPS=OFF -DDCMTK_ENABLE_CXX11=ON diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 8f0d893d0c..00553a1cf6 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dcmtk", - "version": "3.6.6", - "port-version": 3, + "version": "3.6.7", "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.", + "homepage": "https://github.com/DCMTK/dcmtk", + "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", "supports": "!arm", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 1709f7ed9e..6b96166389 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1857,8 +1857,8 @@ "port-version": 1 }, "dcmtk": { - "baseline": "3.6.6", - "port-version": 3 + "baseline": "3.6.7", + "port-version": 0 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index a75be29323..d335fccb17 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df20e5c0215de121a9137a9047fabbde17bab8f7", + "version": "3.6.7", + "port-version": 0 + }, { "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", "version": "3.6.6",