Date: Mon, 6 May 2024 06:12:59 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cfb5772864c0 - main - science/orthanc: update 1.11.0 =?utf-8?Q?=E2=86=92?= 1.12.3 Message-ID: <202405060612.4466CxmI003435@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfb5772864c03ab01aaaefccc1f441ee2517a1ff commit cfb5772864c03ab01aaaefccc1f441ee2517a1ff Author: Frank Scholl <maintainer.freebsd@xpoundit.com> AuthorDate: 2024-05-06 06:09:11 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-05-06 06:12:53 +0000 science/orthanc: update 1.11.0 → 1.12.3 PR: 275621 Approved by: maintainer.freebsd@xpoundit.com (maintainer) --- science/orthanc/Makefile | 10 +++--- science/orthanc/distinfo | 6 ++-- ...ork_Resources_CMake_CivetwebConfiguration.cmake | 4 +-- ...ork_Resources_CMake_ProtobufConfiguration.cmake | 37 ++++++++++++++++++++++ ...atch-OrthancServer_Resources_Configuration.json | 6 ++-- science/orthanc/pkg-plist | 5 +++ 6 files changed, 56 insertions(+), 12 deletions(-) diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile index 3de0af855788..17b96314a9f5 100644 --- a/science/orthanc/Makefile +++ b/science/orthanc/Makefile @@ -1,8 +1,7 @@ PORTNAME= orthanc -DISTVERSION= 1.11.0 -PORTREVISION= 13 +DISTVERSION= 1.12.3 CATEGORIES= science -MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/orthanc/ +MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc/ DISTNAME= Orthanc-${PORTVERSION} MAINTAINER= maintainer.freebsd@xpoundit.com @@ -12,6 +11,8 @@ WWW= https://www.orthanc-server.com/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= protoc:devel/protobuf + LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libcivetweb.so:www/civetweb \ libcurl.so:ftp/curl \ @@ -20,9 +21,10 @@ LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpng16.so:graphics/png \ + libprotobuf.so:devel/protobuf \ libpugixml.so:textproc/pugixml \ libtiff.so:graphics/tiff \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ USES= cmake gnome iconv jpeg lua python:build sqlite ssl USE_GNOME= libxml2 diff --git a/science/orthanc/distinfo b/science/orthanc/distinfo index f28286e4fad0..66007b6a7195 100644 --- a/science/orthanc/distinfo +++ b/science/orthanc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652266484 -SHA256 (Orthanc-1.11.0.tar.gz) = 23949a70562487fd6e79d6f3f13c71a0fc90aa25e492fb3a99575fee0722c5af -SIZE (Orthanc-1.11.0.tar.gz) = 1899829 +TIMESTAMP = 1714974143 +SHA256 (Orthanc-1.12.3.tar.gz) = 64b7ed7506a60e52f52121efb14961485b710fd092ab73d6c550fa25a01f516b +SIZE (Orthanc-1.12.3.tar.gz) = 2043176 diff --git a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake index 0237ef13ed79..e0ac6558feb7 100644 --- a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake +++ b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake @@ -1,6 +1,6 @@ ---- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig 2021-08-30 20:14:33 UTC +--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig 2023-07-04 14:39:31 UTC +++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake -@@ -109,32 +109,38 @@ else() +@@ -110,32 +110,38 @@ else() cmake_reset_check_state() set(CMAKE_REQUIRED_LIBRARIES dl pthread) diff --git a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake new file mode 100644 index 000000000000..e6d9c8ff88cf --- /dev/null +++ b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake @@ -0,0 +1,37 @@ +--- OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig 2023-12-05 11:17:50 UTC ++++ OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake +@@ -64,22 +64,26 @@ else() + message(FATAL_ERROR "Please install the libprotobuf-dev package") + endif() + +- set(CMAKE_REQUIRED_LIBRARIES "protobuf") ++ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ find_package(Protobuf REQUIRED) ++ else() ++ set(CMAKE_REQUIRED_LIBRARIES "protobuf") + +- include(CheckCXXSourceCompiles) +- check_cxx_source_compiles( +- " ++ include(CheckCXXSourceCompiles) ++ check_cxx_source_compiles( ++ " + #include <google/protobuf/descriptor.h> + int main() + { + google::protobuf::FieldDescriptor::TypeName(google::protobuf::FieldDescriptor::TYPE_FLOAT); + } + " HAVE_PROTOBUF_LIB) +- if (NOT HAVE_PROTOBUF_LIB) +- message(FATAL_ERROR "Cannot find the protobuf library") ++ if (NOT HAVE_PROTOBUF_LIB) ++ message(FATAL_ERROR "Cannot find the protobuf library") ++ endif() ++ ++ unset(CMAKE_REQUIRED_LIBRARIES) + endif() +- +- unset(CMAKE_REQUIRED_LIBRARIES) + + link_libraries(protobuf) + endif() diff --git a/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json b/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json index 91f978822db2..73c17f35620f 100644 --- a/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json +++ b/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json @@ -1,6 +1,6 @@ ---- OrthancServer/Resources/Configuration.json.orig 2021-01-29 09:36:16 UTC +--- OrthancServer/Resources/Configuration.json.orig 2023-07-04 14:39:31 UTC +++ OrthancServer/Resources/Configuration.json -@@ -10,12 +10,12 @@ +@@ -15,12 +15,12 @@ // Path to the directory that holds the heavyweight files (i.e. the // raw DICOM instances). Backslashes must be either escaped by // doubling them, or replaced by forward slashes "/". @@ -15,7 +15,7 @@ // Path to the directory where Orthanc stores its large temporary // files. The content of this folder can be safely deleted once -@@ -53,6 +53,7 @@ +@@ -83,6 +83,7 @@ // find shared libraries. Backslashes must be either escaped by // doubling them, or replaced by forward slashes "/". "Plugins" : [ diff --git a/science/orthanc/pkg-plist b/science/orthanc/pkg-plist index b44ca2376c94..293f39bc83d4 100644 --- a/science/orthanc/pkg-plist +++ b/science/orthanc/pkg-plist @@ -11,10 +11,15 @@ bin/OrthancRecoverCompressedFile include/orthanc/OrthancCDatabasePlugin.h include/orthanc/OrthancCPlugin.h +include/orthanc/OrthancDatabasePlugin.proto sbin/Orthanc +%%DATADIR%%/plugins/libDelayedDeletion.so +%%DATADIR%%/plugins/libDelayedDeletion.so.%%DISTVERSION%% %%DATADIR%%/plugins/libHousekeeper.so %%DATADIR%%/plugins/libHousekeeper.so.%%DISTVERSION%% %%DATADIR%%/plugins/libModalityWorklists.so %%DATADIR%%/plugins/libModalityWorklists.so.%%DISTVERSION%% +%%DATADIR%%/plugins/libMultitenantDicom.so +%%DATADIR%%/plugins/libMultitenantDicom.so.%%DISTVERSION%% %%DATADIR%%/plugins/libServeFolders.so %%DATADIR%%/plugins/libServeFolders.so.%%DISTVERSION%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405060612.4466CxmI003435>