From patchwork Thu Aug 20 15:10:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 23700 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 6F7C927BBE6; Thu, 20 Aug 2020 16:12:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 92DD127BBE5 for ; Thu, 20 Aug 2020 16:12:39 +0100 (BST) Received: from localhost ([::1]:47586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8mF5-0007ua-4y for patchwork@mira.cbaines.net; Thu, 20 Aug 2020 11:12:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mDd-0006C6-GK for guix-patches@gnu.org; Thu, 20 Aug 2020 11:11:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8mDd-0006tY-5F for guix-patches@gnu.org; Thu, 20 Aug 2020 11:11:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8mDd-00067E-0l for guix-patches@gnu.org; Thu, 20 Aug 2020 11:11:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: Update package definition. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Aug 2020 15:11:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Cc: Raghav Gururajan , Danny Milosavljevic Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.159793626823488 (code B ref 42958); Thu, 20 Aug 2020 15:11:08 +0000 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:08 +0000 Received: from localhost ([127.0.0.1]:43470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDa-00066M-KC for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:07 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDR-00063Z-Ij for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:58 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id E30483368069; Thu, 20 Aug 2020 17:10:56 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 20 Aug 2020 17:10:30 +0200 Message-Id: <20200820151050.9529-9-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Raghav Gururajan * gnu/packages/image.scm (openjpeg): Update package definition. [outputs]: New output "doc". [arguments]<#:tests?>: Remove argument. <#:configure-flags>[-DBUILD_DOC]: New flag. [-DBUILD_LUTS_GENERATOR]: New flag. [-DBUILD_UNIT_TESTS]: New flag. [-DBUILD_MJ2]: New flag. [-DBUILD_JPWL]: New flag. [-DBUILD_JP3D]: New flag. [-DBUILD_TESTING]: New flag. [-DOPJ_DATA_ROOT]: New flag. <#:phases>['disable-failing-tests]: New phase. ['move-docs]: New phase. [native-inputs]: Add doxygen, openjpeg-data and python-wrapper. [inputs]: Add curl and fcgi. [synopsis]: Modify. [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/image.scm | 88 +++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3fdc6db8a1..5a4425e993 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -763,35 +763,71 @@ images of initially unknown height.") (package (name "openjpeg") (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uclouvain/openjpeg") - (commit (string-append "v" version)))) - (file-name (git-file-name "openjpeg" version)) - (sha256 - (base32 - "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/uclouvain/openjpeg.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository - #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) + '(#:configure-flags + (list + "-DBUILD_DOC=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_LUTS_GENERATOR=ON" + "-DBUILD_UNIT_TESTS=ON" + "-DBUILD_MJ2=ON" + "-DBUILD_JPWL=ON" + ;; To be enabled after Java becomes reproducible. + ;; "-DBUILD_JPIP=ON" + ;; "-DBUILD_JPIP_SERVER=ON" + ;; "-DBUILD_JAVA=ON" + "-DBUILD_JP3D=ON" + "-DBUILD_TESTING=ON" + (string-append "-DOPJ_DATA_ROOT=" + (assoc-ref %build-inputs "openjpeg-data"))) + #:phases + (modify-phases %standard-phases + ;; To be re-enabled after upstream fixes the bug, + ;; https://github.com/uclouvain/openjpeg/issues/1264 + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(nonregression\\)") + "")) + #t)) + (add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/html") + (string-append doc "/share/doc/html")) + #t)))))) + (native-inputs + `(("doxygen" ,doxygen) + ("openjpeg-data" ,openjpeg-data) ; Files for test-suite + ("python" ,python-wrapper))) (inputs - `(("lcms" ,lcms) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("zlib" ,zlib))) - (synopsis "JPEG 2000 codec") - (description - "The OpenJPEG library is a JPEG 2000 codec written in C. It has -been developed in order to promote the use of JPEG 2000, the new -still-image compression standard from the Joint Photographic Experts -Group (JPEG). - -In addition to the basic codec, various other features are under -development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, -an indexing tool useful for the JPIP protocol, JPWL-tools for -error-resilience, a Java-viewer for j2k-images, ...") + `(("curl" ,curl) + ("fcgi" ,fcgi) + ("lcms" ,lcms) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("zlib" ,zlib))) + (synopsis "OPENJPEG Library and Applications") + (description "OpenJPEG is an implementation of JPEG 2000 codec written in C +language. It has been developed in order to promote the use of JPEG 2000, a +still-image compression standard from the Joint Photographic Experts Group +(JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a +JPEG 2000 Reference Software.") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2)))