Skip to content

gdcm: 3.0.24 -> 3.0.25 #410841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbsds merged 2 commits into from
Jun 8, 2025
Merged

gdcm: 3.0.24 -> 3.0.25 #410841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b7bd3
gdcm: 3.0.24 -> 3.0.25
qbisi May 22, 2025
6cffba3
gdcm: use ctestCheckHook
qbisi May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
index 7ad350d..6f962ce 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
@@ -43,6 +43,9 @@ static const int losslylosslessarray[][3] = {
{ 1, 0, 1 }, // MPEG2MainProfileHighLevel
{ 1, 0, 1 }, // MPEG4AVCH264HighProfileLevel4_1
{ 1, 0, 1 }, // MPEG4AVCH264BDcompatibleHighProfileLevel4_1
+ { 0, 1, 1 }, // HTJ2KLossless
+ { 0, 1, 1 }, // HTJ2KRPCLLossless
+ { 1, 0, 1 }, // HTJ2K
};

static int TestTransferSyntaxAll()
27 changes: 20 additions & 7 deletions pkgs/development/libraries/gdcm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
cmake,
enableVTK ? true,
vtk,
Expand All @@ -14,19 +15,32 @@
openjpeg,
zlib,
pkg-config,
ctestCheckHook,
}:

stdenv.mkDerivation rec {
pname = if enablePython then "python-gdcm" else "gdcm";
version = "3.0.24";
version = "3.0.25";

src = fetchFromGitHub {
owner = "malaterre";
repo = "GDCM";
tag = "v${version}";
hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE=";
hash = "sha256-PYVVlSqeAZCWvnWPqqWGQIWatMfPYqnrXc7cqi8UseU=";
};

patches =
[
./add-missing-losslylosslessarray-in-TestTransferSyntax.patch
]
++ lib.optionals (lib.versionOlder vtk.version "9.3") [
(fetchpatch2 {
url = "https://github.com/malaterre/GDCM/commit/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch?full_index=1";
hash = "sha256-Yt5f4mxhP5n+L0A/CRq3CxKCqUT7LZ8uKdbCf9P71Zc=";
revert = true;
})
];

cmakeFlags =
[
"-DGDCM_BUILD_APPLICATIONS=ON"
Expand Down Expand Up @@ -95,11 +109,10 @@ stdenv.mkDerivation rec {
"TestRescaler2"
];

checkPhase = ''
runHook preCheck
ctest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$'
runHook postCheck
'';
nativeCheckInputs = [
ctestCheckHook
];

doCheck = true;
# note that when the test data is available to the build via `fetchSubmodules = true`,
# a number of additional but much slower tests are enabled
Expand Down