Sebastien Jodogne pushed to branch master at Debian Med / orthanc-gdcm
Commits: b25edca1 by jodogne-guest at 2026-04-28T16:59:25+02:00 use the shared liborthancframework instead of the static one - - - - - 51cf33b9 by jodogne-guest at 2026-04-28T17:05:49+02:00 fix FTBFS with recent versions of cmake - - - - - 3ed1982b by jodogne-guest at 2026-04-28T17:13:01+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/cmake - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +orthanc-gdcm (1.8+dfsg-3) unstable; urgency=medium + + * Use the shared Orthanc Framework library instead of the static one, + which necessitates using liborthancframework-dev >= 1.12.11+dfsg-5 + for proper versioning of the shared libra + + -- Sebastien Jodogne <[email protected]> Tue, 28 Apr 2026 16:54:43 +0200 + orthanc-gdcm (1.8+dfsg-2) unstable; urgency=medium * Fix FTBFS with recent versions of CMake. Closes: #1113371 ===================================== debian/control ===================================== @@ -6,11 +6,10 @@ Priority: optional Build-Depends: cmake, debhelper-compat (= 13), libgdcm-dev, - liborthancframework-dev, + liborthancframework-dev (>= 1.12.11+dfsg-5), orthanc-dev (>= 1.7.0), - unzip, - uuid-dev -Standards-Version: 4.7.2 + unzip +Standards-Version: 4.7.4 Vcs-Browser: https://salsa.debian.org/med-team/orthanc-gdcm Vcs-Git: https://salsa.debian.org/med-team/orthanc-gdcm.git Homepage: https://orthanc.uclouvain.be/book/plugins/gdcm.html @@ -21,7 +20,6 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 1.9.7+dfsg-6) -Built-Using: ${orthancframework:Built-Using} Description: DICOM transcoder/decoder for Orthanc using GDCM (notably for JPEG2k) This package installs a plugin for Orthanc, the lightweight, RESTful Vendor Neutral Archive for medical imaging. The plugin extends ===================================== debian/patches/cmake ===================================== @@ -3,10 +3,10 @@ Author: Sebastien Jodogne <[email protected]> Forwarded: https://orthanc.uclouvain.be/hg/orthanc-gdcm/rev/890518e9d7a8 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: OrthancGdcm-1.8/CMakeLists.txt +Index: orthanc-gdcm-1.8+dfsg/CMakeLists.txt =================================================================== ---- OrthancGdcm-1.8.orig/CMakeLists.txt -+++ OrthancGdcm-1.8/CMakeLists.txt +--- orthanc-gdcm-1.8+dfsg.orig/CMakeLists.txt ++++ orthanc-gdcm-1.8+dfsg/CMakeLists.txt @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -16,10 +16,25 @@ Index: OrthancGdcm-1.8/CMakeLists.txt project(OrthancGdcm) -Index: OrthancGdcm-1.8/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake +@@ -54,7 +54,13 @@ include(${CMAKE_SOURCE_DIR}/Resources/Or + + if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") + if (ORTHANC_FRAMEWORK_USE_SHARED) +- include(FindBoost) ++ # https://cmake.org/cmake/help/latest/policy/CMP0167.html ++ if (CMAKE_VERSION VERSION_GREATER "3.30") ++ find_package(Boost CONFIG) ++ else() ++ include(FindBoost) ++ endif() ++ + find_package(Boost COMPONENTS thread) + + if (NOT Boost_FOUND) +Index: orthanc-gdcm-1.8+dfsg/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake =================================================================== ---- OrthancGdcm-1.8.orig/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake -+++ OrthancGdcm-1.8/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake +--- orthanc-gdcm-1.8+dfsg.orig/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake ++++ orthanc-gdcm-1.8+dfsg/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake @@ -495,7 +495,15 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "s include(CheckIncludeFile) ===================================== debian/rules ===================================== @@ -19,18 +19,10 @@ CMAKE_EXTRA_FLAGS += \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSTATIC_BUILD:BOOL=OFF \ -DORTHANC_FRAMEWORK_SOURCE=system \ - -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=OFF \ - "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=dcmdata dcmjpls dcmimage dcmjpeg ofstd boost_filesystem boost_iostreams boost_locale boost_regex boost_thread pugixml uuid jsoncpp" \ + -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=ON \ -DCMAKE_BUILD_TYPE=None # The build type must be set to None, see #711515 -# Automated generation of the "Built-Using" attribute in "d/control" -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989128 -# Adapted from: -# https://wiki.debian.org/SIMDEverywhere#Approach (Point 6) -override_dh_gencontrol: - dh_gencontrol -- -Vorthancframework:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W liborthancframework-dev)" - override_dh_auto_configure: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) View it on GitLab: https://salsa.debian.org/med-team/orthanc-gdcm/-/compare/9a9f23a5907ec829c84597aa3847912e256c0f98...3ed1982b9005db1152187ef39f4cb9de713f4315 -- View it on GitLab: https://salsa.debian.org/med-team/orthanc-gdcm/-/compare/9a9f23a5907ec829c84597aa3847912e256c0f98...3ed1982b9005db1152187ef39f4cb9de713f4315 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
