diff --git a/ports/gdcm/copyright.diff b/ports/gdcm/copyright.diff deleted file mode 100644 index 3a7e72e250..0000000000 --- a/ports/gdcm/copyright.diff +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt -index 4cdc999..5971705 100644 ---- a/Utilities/CMakeLists.txt -+++ b/Utilities/CMakeLists.txt -@@ -12,8 +12,8 @@ if(NOT GDCM_USE_SYSTEM_LJPEG) - endif() - - # Do expat --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmexpat/COPYING) - if(NOT GDCM_USE_SYSTEM_EXPAT) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmexpat/COPYING) - set(EXPAT_NAMESPACE "GDCMEXPAT") - set(EXPAT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(EXPAT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -22,8 +22,8 @@ if(NOT GDCM_USE_SYSTEM_EXPAT) - endif() - - # Do openjpeg (jpeg2000 implementation) --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmopenjpeg/LICENSE) - if(NOT GDCM_USE_SYSTEM_OPENJPEG) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmopenjpeg/LICENSE) - set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") - set(OPENJPEG_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(OPENJPEG_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -34,9 +34,9 @@ if(NOT GDCM_USE_SYSTEM_OPENJPEG) - endif() - - # Do jpegls (JPEG-LS aka near lossless implementation) --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmcharls/License.txt) - if(GDCM_USE_JPEGLS) - if(NOT GDCM_USE_SYSTEM_CHARLS) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmcharls/License.txt) - set(CHARLS_NAMESPACE "GDCMCHARLS") - set(CHARLS_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(CHARLS_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -47,9 +47,9 @@ endif() - endif() - - # Do md5 --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmmd5/COPYING) - if(GDCM_BUILD_TESTING) - if(NOT GDCM_USE_SYSTEM_MD5) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmmd5/COPYING) - set(MD5_NAMESPACE "GDCMMD5") - set(MD5_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(MD5_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -59,8 +59,8 @@ endif() - endif() - - # Do zlib --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmzlib/COPYING) - if(NOT GDCM_USE_SYSTEM_ZLIB) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmzlib/COPYING) - set(ZLIB_NAMESPACE "GDCMZLIB") - set(ZLIB_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(ZLIB_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -70,8 +70,8 @@ endif() - - # Do getopt - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) -- APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/getopt/COPYING) - if(WIN32 AND NOT CYGWIN AND NOT MINGW) -+ APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/getopt/COPYING) - set(GETOPT_NAMESPACE "GDCMGETOPT") - set(GETOPT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(GETOPT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -81,9 +81,9 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) - endif() - - # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) - if(NOT WIN32 AND NOT MINGW) - if(NOT GDCM_USE_SYSTEM_UUID) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) - set(UUID_NAMESPACE "GDCMUUID") - set(UUID_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) - set(UUID_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) -@@ -92,8 +92,8 @@ if(NOT WIN32 AND NOT MINGW) - endif() - endif() - --APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/pvrg/COPYING) - if(GDCM_USE_PVRG) -+APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/pvrg/COPYING) - if(NOT GDCM_USE_SYSTEM_PVRG) - add_subdirectory(pvrg) - endif() diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index b9ea10b9e3..58495d3400 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM REF "v${VERSION}" - SHA512 c1e9b8266484085c3775ef77d6b09fd60054ee36bbdc7d56c144bfa0ed2fe66136b3fc423cab26e9a148eccbdc97f1d03ae1d1b158b3a6555f1a703f7824135e + SHA512 3d9eebd7788a71d8a329b33d18b329c2f4a17f4d5c5866639854c33f567b8316bd6b23a926164368b71b8203d906381cf9942c599724e042ad41308e2efc2cb9 HEAD_REF master PATCHES - copyright.diff no-absolute-paths.diff prefer-config.diff ) diff --git a/ports/gdcm/prefer-config.diff b/ports/gdcm/prefer-config.diff index 3698bab7ea..97c2346ff0 100644 --- a/ports/gdcm/prefer-config.diff +++ b/ports/gdcm/prefer-config.diff @@ -11,11 +11,11 @@ index 169cb82..c77cf1f 100644 # # GDCMConfig.cmake - CMake configuration file for external projects. diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38c65d1..b0cb77b 100644 +index e0064ea..51c47e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -360,8 +360,8 @@ else() - endif() +@@ -413,8 +413,8 @@ option(GDCM_USE_SYSTEM_OPENJPEG "Use system openjpeg" OFF) + option(GDCM_USE_SYSTEM_CHARLS "Use system charls" OFF) if(GDCM_USE_SYSTEM_OPENJPEG) - find_package(OpenJPEG 2.0.0 REQUIRED) @@ -25,7 +25,7 @@ index 38c65d1..b0cb77b 100644 else() set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) endif() -@@ -401,7 +401,7 @@ if(GDCM_USE_SYSTEM_ZLIB) +@@ -454,7 +454,7 @@ if(GDCM_USE_SYSTEM_ZLIB) # If user say so, then this is a requirement ! find_package(ZLIB REQUIRED) include_directories(${ZLIB_INCLUDE_DIR}) @@ -34,7 +34,7 @@ index 38c65d1..b0cb77b 100644 else() set(GDCM_ZLIB_LIBRARIES "gdcmzlib") endif() -@@ -420,8 +420,8 @@ endif() +@@ -473,8 +473,8 @@ endif() if(GDCM_USE_SYSTEM_EXPAT) # If user say so, then this is a requirement ! diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index a907fc9cb3..4affac7ed8 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdcm", - "version": "3.2.5", + "version": "3.2.7", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e67924cede..5b70e78af2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3325,7 +3325,7 @@ "port-version": 1 }, "gdcm": { - "baseline": "3.2.5", + "baseline": "3.2.7", "port-version": 0 }, "gdk-pixbuf": { diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 9698602448..34a70decad 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34596aeecafc89cbb9af4a2d91d8242f18d73573", + "version": "3.2.7", + "port-version": 0 + }, { "git-tree": "f8402d7f910f3c10072897403fa94e1af793a8fc", "version": "3.2.5",