From patchwork Tue Jan 10 14:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 46020 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3211E27BBE9; Tue, 10 Jan 2023 20:27:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 901A527BBEB for ; Tue, 10 Jan 2023 20:27:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFLD6-0007zd-JT; Tue, 10 Jan 2023 15:27:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFLD4-0007zF-Ce for guix-patches@gnu.org; Tue, 10 Jan 2023 15:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFLD3-0003hn-Vs for guix-patches@gnu.org; Tue, 10 Jan 2023 15:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFLD3-0002Ui-RH for guix-patches@gnu.org; Tue, 10 Jan 2023 15:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60640] Gnu: Add gdcm Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Jan 2023 20:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?utf-8?q?Tor-bj=C3=B6rn?= Claesson Cc: 60640@debbugs.gnu.org X-Debbugs-Original-Cc: 60640@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16733823969557 (code B ref -1); Tue, 10 Jan 2023 20:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2023 20:26:36 +0000 Received: from localhost ([127.0.0.1]:41217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFLCd-0002U5-Qs for submit@debbugs.gnu.org; Tue, 10 Jan 2023 15:26:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:40924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFLCb-0002Tx-FQ for submit@debbugs.gnu.org; Tue, 10 Jan 2023 15:26:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFLCa-0007wW-Dk for guix-patches@gnu.org; Tue, 10 Jan 2023 15:26:32 -0500 Received: from tobias.gr ([2a02:c205:2020:6054::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFLCY-0003dX-53 for guix-patches@gnu.org; Tue, 10 Jan 2023 15:26:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=rhtGKdVtCXDUJ ruUh07HdRwx16+SzRH6DBMIfI+BCaQ=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=YsP5BxBxHfCwnePXxgCMd0XPCAESitDqBb5NLh SAs0xXsym3aAMgCNUBFnwAsvhS5Y3zM5kjjyUtMsYhdWaeM/dJWIOLTYc6Jut3dM7LgQd5 xxrNI6TpJL56/efzWgsA94fG10eiuB3RrvvL5yzhZk3QN0E3NJlf4UaMXzB3Y2KPZTR+V/ f29PHmB89eIw9ZA5fbbtk6ER3Rg/C30fPb3ukTHWwq+Z9Q7wmjwaQFK1/nec15HhoUK1Q7 NVyE0C0W09+lKWaWUIeoSUgzhSm53Kedi6o60XSqqaSrl8KB4W5ycu78YFD7Un8QjgpIcY OXAOS6knlNN68is8ko3ZifxA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 27214356 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Tue, 10 Jan 2023 20:26:18 +0000 (UTC) References: <877cxyp1wf.fsf@gmail.com> Date: Tue, 10 Jan 2023 15:52:49 +0100 In-reply-to: <877cxyp1wf.fsf@gmail.com> BIMI-Selector: v=BIMI1; s=default; Message-ID: <87y1qaxhh7.fsf@nckx> MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_03_06=1.592, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Tor-björn Claesson 写道： > 1. I have not yet been able to build the bin output, > which consists of utilities for manipulating DICOM data. OK, I'll take a look. > 2. It does not build pdf-documentation, since that would require > texlive as a native input. OK. You can add this sort of information as a comment by the relevant line, so it doesn't get lost (even during review :-). > 3. It does not perform tests. OK, I'll take a look. If tests are disabled, the reason should always be noted in a comment. Even if it's just ‘; no test suite’. > 4. It uses socketxx, ljpeg and papyrus3 from the gdcm sources. Here too I've punted on that by just adding a comment for now. > +(define-public gdcm It used to be common to unconditionally add packages to the end of files, but this needlessly increased the risk of merge conflicts. Instead, just add them wherever they first fit alphabetically; here, I put it above ‘mia’. > + (version "3.0.20") ‘guix lint’ says this can be updated to 3.1.0 but I didn't try, as I'd rather it be tested by an actual user — i.e., you. > + > "1w78cmm9q7aavs7svdkl4dgilcqk4yazci9m6x7icrssb7cj991i")))) > + (build-system cmake-build-system) > + (outputs '("out" "doc")) /share/doc wasn't actually installed into "doc", but to "out", so I set the GDCM_INSTALL_DOC_DIR configure flag. > + (arguments > + (list #:tests? #f > + #:phases #~(modify-phases %standard-phases > + (add-before 'configure 'set-LDFLAGS > + (lambda* (#:key inputs outputs > #:allow-other-keys) > + (setenv "LDFLAGS" > + (string-append > "-Wl,-rpath=" > + #$output > "/lib")))) > + (add-before 'build 'patch-gdcm-charls.h > + (lambda _ > + (substitute* > "../source/Utilities/gdcm_charls.h" > + (("# include ") Purely as a matter of taste I dropped the ‘# include ’ from both strings and escaped the ‘.’ in the regexp. > + "# include ")) > #t))) ‘#t’ endings are also obsolete. Just drop them entirely. Phases can now safely return anything, including nothing or undefined. I added the following phase to work around log spam, since I didn't find its source (nor did I look very hard) [edit: it was indeed graphviz, thanks]. By default, $HOME is not writable in the build environment. (add-before 'build 'set-HOME ;; The build spams ‘Fontconfig error: No writable cache ;; directories’ in a seemingly endless loop otherwise. (lambda _ (setenv "HOME" "/tmp"))) > + #:configure-flags #~(list > "-DCMAKE_SKIP_RPATH:BOOL=YES" I, opinionated, added newlines after #:phases and #:configure-flags. Some people like the ‘extreme indentation’ you get by throwing away half of your screen width. I find it leads to cramped code and noisy patches once the phases need to get actual work done or an even longer CMAKE_ flag comes along. I also added some newlines and tried to group related flags. > + > "-DCMAKE_C_FLAGS=-fvisibility=hidden" > + > "-DCMAKE_CXX_FLAGS=-fvisibility=hidden" Should these be explained in a very brief comment? > + > "-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_JSON:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_UUID:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON" > + > "-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON" Thank you for building with system libraries! Also remove the bundled copies when possible. I did so in a (rather strict) source snippet. > + > "-DGDCM_PDF_DOCUMENTATION:BOOL=OFF" I cannot get the man pages to build, either. They need something called ‘xsl-ns’. I've disabled GDCM_BUILD_DOCBOOK_MANPAGES for now. > + > "-DGCM_BUILD_TESTING:BOOL=OFF" Why is this set? It's reported by CMake as having no effect, and a diff of the output confirms that. > + > "-DGDCM_BUILD_APPLICATIONS:BOOL=OFF" I added a ‘TODO’ comment above these bundled projects: > + > "-DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=OFF" > + > "-DGDCM_USE_SYSTEM_SOCKETXX:BOOL=OFF" > + > "-DGDCM_USE_SYSTEM_LJPEG:BOOL=OFF"))) > + (inputs (list openssl > + expat > + charls > + poppler > + libxml2 > + json-c > + openjpeg > + `(,util-linux "lib") > + zlib)) > + (native-inputs (list git pkg-config doxygen graphviz)) Sorted both. > + (home-page "https://gdcm.sourceforge.net") > + (synopsis > + "C++ library dedicated to reading/parsing and writing > DICOM medical files") > + (description > + "Grassroots DICOM (GDCM) is an implementation of the DICOM > standard > +designed to be open source so that researchers may access > clinical data > +directly. GDCM includes a file format definition and a network > communications > +protocol, both of which should be extended to provide a full > set of tools for > +a researcher or small medical imaging vendor to interface with > an existing > +medical database.") I rewrote this just a smidge. Mostly to remove the extra words, and use pretty @acronym{} mark-up. > + (license license:bsd-3))) I still need to check this. I've attached my WIP V2 to this message, with a commit message matching our conventions. Kind regards, T G-R From e2e2d9e220158aa2fd7dd0f4995c76d7d09ae79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor-bj=C3=B6rn=20Claesson?= Date: Sat, 7 Jan 2023 21:40:42 +0200 Subject: [PATCH v2] gnu: Add gdcm. * gnu/packages/image-processing.scm (gdcm): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/image-processing.scm | 105 ++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..b95cb54964 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -99,6 +99,7 @@ (define-module (gnu packages image-processing) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -196,6 +197,110 @@ (define-public dcmtk "A union of the Apache 2.0 licence and various non-copyleft licences similar to the Modified BSD licence.")))) +(define-public gdcm + (package + (name "gdcm") + (version "3.0.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/malaterre/GDCM/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w78cmm9q7aavs7svdkl4dgilcqk4yazci9m6x7icrssb7cj991i")) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + '(begin + (define (unbundle? file) + (and (file-is-directory? file) + ;; Not all directories represent a bundled project, + ;; and some projects can't yet be unbundled. + (not (member file '("." ".." + "doxygen" + "gdcmext" + "gdcmjpeg" ; TODO + "gdcmrle" + "socketxx"))))) ; TODO + (with-directory-excursion "Utilities" + (for-each (lambda (utility) + (delete-file-recursively utility) + (substitute* "CMakeLists.txt" + (((string-append ".*/" utility "/.*")) ""))) + (scandir "." unbundle?))))))) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + (list #:tests? #f ; XXX + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "LDFLAGS" + (string-append "-Wl,-rpath=" + #$output "/lib")))) + (add-before 'build 'set-HOME + ;; The build spams ‘Fontconfig error: No writable cache + ;; directories’ in a seemingly endless loop otherwise. + (lambda _ + (setenv "HOME" "/tmp"))) + (add-before 'build 'patch-gdcm-charls.h + (lambda _ + (substitute* "../source/Utilities/gdcm_charls.h" + (("") + ""))))) + #:configure-flags + #~(list "-DCMAKE_SKIP_RPATH:BOOL=YES" + "-DCMAKE_BUILD_TYPE:STRING=Release" + "-DCMAKE_C_FLAGS=-fvisibility=hidden" + "-DCMAKE_CXX_FLAGS=-fvisibility=hidden" + "-DGDCM_BUILD_SHARED_LIBS:BOOL=ON" + + "-DGDCM_DOCUMENTATION:BOOL=ON" + "-DGDCM_PDF_DOCUMENTATION:BOOL=OFF" ; TODO? need texlive + (string-append "-DGDCM_INSTALL_DOC_DIR=" + #$output:doc "/share/doc/" #$name) + "-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF" ; TODO: need ‘xsl-ns’ + + "-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON" + "-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON" + "-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON" + "-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON" + "-DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON" + "-DGDCM_USE_SYSTEM_JSON:BOOL=ON" + "-DGDCM_USE_SYSTEM_UUID:BOOL=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON" + "-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON" + + "-DGDCM_BUILD_APPLICATIONS:BOOL=OFF" + + ;; TODO: Unbundle these if possible. + "-DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=OFF" + "-DGDCM_USE_SYSTEM_SOCKETXX:BOOL=OFF" ; socketxx in snippet + "-DGDCM_USE_SYSTEM_LJPEG:BOOL=OFF"))) ; gdcmjpeg in snippet + (inputs (list charls + expat + json-c + libxml2 + openjpeg + openssl + poppler + `(,util-linux "lib") + zlib)) + (native-inputs (list doxygen git graphviz pkg-config)) + (home-page "https://gdcm.sourceforge.net") + (synopsis "C++ library to read, parse, and write DICOM medical files") + (description + "@acronym{GDCM, Grassroots DICOM} implements the @acronym{DICOM, Digital +Imaging and Communications in Medicine} standard to let researchers access +clinical data directly. GDCM includes a file format definition and a network +communications protocol, both of which should be extended to provide a full set +of tools for a researcher or small medical imaging vendor to interface with an +existing medical database.") + (license license:bsd-3))) + (define-public mia (package (name "mia") base-commit: e0ed305f2f096e7048af1a117c72895433f4886a -- 2.38.1