diff --git a/gdcm.yaml b/gdcm.yaml index 3fa1cf74995..7895d9c9910 100644 --- a/gdcm.yaml +++ b/gdcm.yaml @@ -1,7 +1,7 @@ package: name: gdcm - version: "3.1.0" - epoch: 1 + version: "3.2.1" + epoch: 0 description: "Grassroots DICOM Gdcm, Cross-platform DICOM implementation library for C++" copyright: - license: BSD-3-Clause @@ -12,18 +12,18 @@ environment: - build-base - busybox +var-transforms: + - from: ${{package.version}} + match: ^(\d+\.\d+)\.\d+$ + replace: "$1" + to: major-minor-version + pipeline: - uses: git-checkout with: repository: https://github.com/malaterre/GDCM tag: v${{package.version}} - expected-commit: 917a96c8f4d63f2a30ac3a52f31d90127c2d6607 - - # This patch Fixes "missing header" - # Without the header, leads to compilation failures since upstream code uses std::numeric_limits functions. - - uses: patch - with: - patches: numeric-limits.patch + expected-commit: ad32c84455296a204192342dd0fa03bcbfaed479 - uses: cmake/configure with: @@ -80,7 +80,7 @@ test: } EOF - g++ -I/usr/include/gdcm-3.1 -o test_gdcm test_gdcm.cpp -lgdcmDSED -lgdcmMSFF -lgdcmCommon -lgdcmDICT -lgdcmIOD -lgdcmzlib + g++ -I/usr/include/gdcm-${{vars.major-minor-version}} -o test_gdcm test_gdcm.cpp -lgdcmDSED -lgdcmMSFF -lgdcmCommon -lgdcmDICT -lgdcmIOD -lgdcmzlib ./test_gdcm update: diff --git a/gdcm/numeric-limits.patch b/gdcm/numeric-limits.patch deleted file mode 100644 index 72fe504bdd8..00000000000 --- a/gdcm/numeric-limits.patch +++ /dev/null @@ -1,10 +0,0 @@ -// limits header is not included in upstream ---- a/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h -+++ b/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h -@@ -16,6 +16,7 @@ - - #include "gdcmImageToImageFilter.h" - #include "gdcmPhotometricInterpretation.h" -+#include - - namespace gdcm