From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +BN9EmC2bF8XcwAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 15:08:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sKRqDmC2bF+LbwAA1q6Kng (envelope-from ) for ; Thu, 24 Sep 2020 15:08:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EEB2994077C for ; Thu, 24 Sep 2020 15:08:13 +0000 (UTC) Received: from localhost ([::1]:58288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLSqy-0000yQ-S7 for larch@yhetil.org; Thu, 24 Sep 2020 11:08:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLSnv-0006zL-HN for guix-patches@gnu.org; Thu, 24 Sep 2020 11:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLSnu-0001ff-Mf for guix-patches@gnu.org; Thu, 24 Sep 2020 11:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLSnu-00058D-Hi for guix-patches@gnu.org; Thu, 24 Sep 2020 11:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 09/29] gnu: openjpeg: Update package definition. References: <20200820150914.9443-1-dannym@scratchpost.org> In-Reply-To: <20200820150914.9443-1-dannym@scratchpost.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 15:05:02 +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 Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.160095984419657 (code B ref 42958); Thu, 24 Sep 2020 15:05:02 +0000 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 15:04:04 +0000 Received: from localhost ([127.0.0.1]:41245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSmx-00056y-An for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:04:03 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSmt-00056J-GD for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 11:04:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 270B55291B for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:03:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AgFpDaNqNo3b for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:03:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600959832; bh=IX71SdYPf7TrSMJZ4/iq1uau7Yb8dWz/ssx95Td/Bag=; h=To:From:Subject:Date; b=f+alyjYJbF2gA6FOzg7OXpUWuj8ekSc7scvaLJZmf5QyXqm9YolcuejuroSoBpyPv CWjNeHVmbWyi8XF8DqP4kHz8YvUe4bMWcbekjlRzKJqNVRkgN25Ly9TynXoMErGMmq 0OF5jHlhemmKPgiX7/NBOMcbofIEIeoA3skj00/d5eQhAIldErQTwQrDpk2gfF4QBf JCwY02/HCtrmD7MquKdN0eJMY4mAZLTDaEEe48BMvo7RirbsfPwT29sdlGYuToPCcb L5weUrifqogCp153gaZh6UZVbaT7ZAZy729xhfeGWTEoAHMn/HaeOeKEsQc2IY7ro0 EhQvAfQBJpBsw== From: Raghav Gururajan Message-ID: <17717f6c-0dc7-4675-4421-16044d772248@disroot.org> Date: Thu, 24 Sep 2020 11:03:51 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------5FE83E8820CCEF5CF5DDABF9" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=f+alyjYJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: v14i4eZNr5st This is a multi-part message in MIME format. --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch" >From c644a020006d314d27414be5bd901b9774ca53f8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:39:25 -0400 Subject: [PATCH 21/25] gnu: openjpeg: Make some cosmetic changes. * gnu/packages/images.scm (openjpeg): Make some cosmetic changes. --- gnu/packages/image.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ff434bb6c9..e6b5fd6bda 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -807,31 +807,33 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (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") + (commit + (string-append "v" version)))) + (file-name + (git-file-name "openjpeg" version)) + (sha256 + (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository + '(#:tests? #f ;TODO: requires a 1.1 GiB data repository #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) (inputs - `(("lcms" ,lcms) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("zlib" ,zlib))) + `(("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 + "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 -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-openjpeg-Enable-tests.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0022-gnu-openjpeg-Enable-tests.patch" >From 162e90e9df45096a0bd6324ba039da69aa4e0492 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:48:08 -0400 Subject: [PATCH 22/25] gnu: openjpeg: Enable tests. * gnu/packages/image.scm (openjpeg) [arguments]<#:tests?>: Remove argument. <#:configure-flags>[-DBUILD_UNIT_TESTS]: New flag. [-DBUILD_TESTING]: New flag. [-DOPJ_DATA_ROOT]: New flag. <#:phases>['disable-failing-tests]: New phase. [native-inputs]: Add openjpeg-data. --- gnu/packages/image.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e6b5fd6bda..2e97f04f8a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -821,8 +821,25 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository - #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) + `(#:configure-flags + (list + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_UNIT_TESTS=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))))) + (native-inputs + `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-openjpeg-Enable-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0023-gnu-openjpeg-Enable-documentation.patch" >From 03e33cb0d15508c5644451345a112c19e18552cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:53:00 -0400 Subject: [PATCH 23/25] gnu: openjpeg: Enable documentation. * gnu/packages/image.scm (openjpeg) [outputs]: New output "doc". [arguments]<#:configure-flags>[-DBUILD_DOC]: New flag. <#:phases>['move-docs]: New phase. [native-inputs]: Add doxygen. --- gnu/packages/image.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2e97f04f8a..26ed0d7616 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -820,9 +820,11 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (sha256 (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments `(#:configure-flags (list + "-DBUILD_DOC=ON" "-DBUILD_STATIC_LIBS=OFF" "-DBUILD_UNIT_TESTS=ON" "-DBUILD_TESTING=ON" @@ -837,9 +839,19 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (substitute* "tests/CMakeLists.txt" (("add_subdirectory\\(nonregression\\)") "")) - #t))))) + #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 - `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite + `(("doxygen" ,doxygen) + ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-openjpeg-Enable-some-features.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0024-gnu-openjpeg-Enable-some-features.patch" >From 26bdc80f2da072437e58fe305feb038f8b9c722e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:57:23 -0400 Subject: [PATCH 24/25] gnu: openjpeg: Enable some features. * gnu/packages/image.scm (openjpeg) <#:configure-flags>[-DBUILD_LUTS_GENERATOR]: New flag. [-DBUILD_MJ2]: New flag. [-DBUILD_JPWL]: New flag. [-DBUILD_JP3D]: New flag. [native-inputs]: Add python-wrapper. [inputs]: Add curl and fcgi. --- gnu/packages/image.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 26ed0d7616..3c2718bc3b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -826,7 +826,15 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (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"))) @@ -851,9 +859,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC #t)))))) (native-inputs `(("doxygen" ,doxygen) - ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite + ("openjpeg-data" ,openjpeg-data) ; Files for test-suite + ("python" ,python-wrapper))) (inputs - `(("lcms" ,lcms) + `(("curl" ,curl) + ("fcgi" ,fcgi) + ("lcms" ,lcms) ("libpng" ,libpng) ("libtiff" ,libtiff) ("zlib" ,zlib))) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-openjpeg-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0025-gnu-openjpeg-Update-synopsis-and-description.patch" >From c48f3fa4344b5ee13b1fc2ca873587e4a9a46a6a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:59:47 -0400 Subject: [PATCH 25/25] gnu: openjpeg: Update synopsis and description. * gnu/packages/image.scm (openjpeg) [synopsis]: Modify. [description]: Modify. --- gnu/packages/image.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3c2718bc3b..7a03cdcd46 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -868,16 +868,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC ("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, ...") + (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))) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9--