# HG changeset patch # User Sebastien Jodogne # Date 1704376330 -3600 # Node ID 6fc06e1c5f578bcbcb70e82685d7b2653cd63000 # Parent bf4e5434567c4d2e553c823f9679e3366bba3959 sync diff -r bf4e5434567c -r 6fc06e1c5f57 CMakeLists.txt --- a/CMakeLists.txt Wed Jan 03 10:53:48 2024 +0100 +++ b/CMakeLists.txt Thu Jan 04 14:52:10 2024 +0100 @@ -28,7 +28,7 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.2") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -r bf4e5434567c -r 6fc06e1c5f57 NEWS --- a/NEWS Wed Jan 03 10:53:48 2024 +0100 +++ b/NEWS Thu Jan 04 14:52:10 2024 +0100 @@ -4,6 +4,7 @@ * Fixed wrong MIME type for app-config.js that prevents the OHIF viewer from loading with Orthanc 1.12.2 + Version 1.1 (2023-11-24) ======================== diff -r bf4e5434567c -r 6fc06e1c5f57 Resources/Orthanc/CMake/Compiler.cmake --- a/Resources/Orthanc/CMake/Compiler.cmake Wed Jan 03 10:53:48 2024 +0100 +++ b/Resources/Orthanc/CMake/Compiler.cmake Thu Jan 04 14:52:10 2024 +0100 @@ -43,6 +43,13 @@ # use by "ExternalProject" in CMake SET(CMAKE_LSB_CC $ENV{LSB_CC} CACHE STRING "") SET(CMAKE_LSB_CXX $ENV{LSB_CXX} CACHE STRING "") + + # This is necessary to build "Orthanc mainline - Framework LSB + # Release" on "buildbot-worker-debian11" + set(LSB_PTHREAD_NONSHARED "${LSB_PATH}/lib64-${LSB_TARGET_VERSION}/libpthread_nonshared.a") + if (EXISTS ${LSB_PTHREAD_NONSHARED}) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LSB_PTHREAD_NONSHARED}") + endif() endif() @@ -124,12 +131,17 @@ ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") - if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND + if (# NOT ${CMAKE_SYSTEM_VERSION} STREQUAL "LinuxStandardBase" AND + NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") # The "--no-undefined" linker flag makes the shared libraries # (plugins ModalityWorklists and ServeFolders) fail to compile on # OpenBSD, and make the PostgreSQL plugin complain about missing - # "environ" global variable in FreeBSD + # "environ" global variable in FreeBSD. + # + # TODO - Furthermore, on Linux Standard Base running on Debian 12, + # the "-Wl,--no-undefined" seems to break the compilation (added + # after Orthanc 1.12.2). This is disabled for now. set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") endif() diff -r bf4e5434567c -r 6fc06e1c5f57 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake --- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Wed Jan 03 10:53:48 2024 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Jan 04 14:52:10 2024 +0100 @@ -158,6 +158,8 @@ set(ORTHANC_FRAMEWORK_MD5 "d32a0cde03b6eb603d8dd2b33d38bf1b") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.1") set(ORTHANC_FRAMEWORK_MD5 "8a435140efc8ff4a01d8242f092f21de") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.2") + set(ORTHANC_FRAMEWORK_MD5 "d2476b9e796e339ac320b5333489bdb3") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -189,7 +191,7 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5") # DICOMweb 1.15 (framework pre-1.12.2) set(ORTHANC_FRAMEWORK_PRE_RELEASE ON) - set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f") + set(ORTHANC_FRAMEWORK_MD5 "ebe8bdf388319f1c9536b2b680451848") endif() endif() endif()