diff --git a/ports/dcmtk/dependencies.diff b/ports/dcmtk/dependencies.diff index 91d61b7841..930807ca57 100644 --- a/ports/dcmtk/dependencies.diff +++ b/ports/dcmtk/dependencies.diff @@ -1,5 +1,5 @@ diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake -index 510027c..eb8fe90 100644 +index 837900575..2e1c0a2ef 100644 --- a/CMake/3rdparty.cmake +++ b/CMake/3rdparty.cmake @@ -1,3 +1,11 @@ @@ -14,7 +14,7 @@ index 510027c..eb8fe90 100644 set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback") # Advanced user (eg. vcpkg) may want to override this: if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT) -@@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE) else() message(STATUS "Info: DCMTK TIFF support will be enabled") include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) @@ -23,16 +23,16 @@ index 510027c..eb8fe90 100644 endif() endif() endif() -@@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE) message(STATUS "Info: DCMTK PNG support will be enabled") set(WITH_LIBPNG 1) include_directories(${PNG_INCLUDE_DIR}) -- set(LIBPNG_LIBS ${PNG_LIBRARY}) +- set(LIBPNG_LIBS ${PNG_LIBRARY} ${LIBPNG_EXTRA_LIBS_STATIC}) + set(LIBPNG_LIBS ${PNG_LIBRARIES}) endif() endif() -@@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE) else() message(STATUS "Info: DCMTK XML support will be enabled") set(WITH_LIBXML 1) @@ -41,7 +41,7 @@ index 510027c..eb8fe90 100644 set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) endif() endif() -@@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE) +@@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE) # Find libiconv if(DCMTK_WITH_ICONV) find_package(Iconv QUIET) diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 22521afae5..56b3513deb 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk REF "DCMTK-${VERSION}" - SHA512 fcb222182ea653304a1c49db31899a8b08d881916f90d3d35bfab2896aa11473232ac0c0f2195e4d478a6188d3b2c5f54d5172f29c42688c5d05f9bf738ca775 + SHA512 6c7699d222b3a26f2bf52fddbf3278946429f9b4b5cdd0607fb3c3fa82f5a13c6289c831d7a584700c9f59ae4244d94ea678a22a34aee988399056436f600a95 HEAD_REF master PATCHES dcmtk.patch @@ -99,11 +99,13 @@ if ("tools" IN_LIST FEATURES) dcmcjpls dcmconv dcmcrle + dcmdecap dcmdjpeg dcmdjpls dcmdrle dcmdspfn dcmdump + dcmencap dcmftest dcmgpdir dcmicmp @@ -140,6 +142,7 @@ if ("tools" IN_LIST FEATURES) findscu getscu img2dcm + json2dcm mkcsmapper mkesdb movescu diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 4db0fe8f85..3683e5a142 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dcmtk", - "version": "3.6.9", - "port-version": 2, + "version": "3.7.0", "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": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1e523bed41..1d2068e5d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2401,8 +2401,8 @@ "port-version": 1 }, "dcmtk": { - "baseline": "3.6.9", - "port-version": 2 + "baseline": "3.7.0", + "port-version": 0 }, "debug-assert": { "baseline": "1.3.4", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 7189a5fe0c..6b5d474fd7 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "288bd880194f8ef326245cace498d59017b5a2ec", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "0ff9c4eff525cb8cf1d04bf9952dc9446c3eef3a", "version": "3.6.9",