From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SM7JEJuWF2DVGgAA0tVLHw (envelope-from ) for ; Mon, 01 Feb 2021 05:50:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kBqADJuWF2C1BAAAbx9fmQ (envelope-from ) for ; Mon, 01 Feb 2021 05:50:19 +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 D4E2F9402B5 for ; Mon, 1 Feb 2021 05:50:18 +0000 (UTC) Received: from localhost ([::1]:35496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6S6L-0002BN-SK for larch@yhetil.org; Mon, 01 Feb 2021 00:50:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6S67-0002BG-DB for guix-patches@gnu.org; Mon, 01 Feb 2021 00:50:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6S66-0008QN-32 for guix-patches@gnu.org; Mon, 01 Feb 2021 00:50:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6S65-0003zc-UL for guix-patches@gnu.org; Mon, 01 Feb 2021 00:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46223] [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. References: <875z3c49ts.fsf@gmail.com> In-Reply-To: <875z3c49ts.fsf@gmail.com> Resent-From: Evan Straw Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 05:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46223 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46223@debbugs.gnu.org Received: via spool by 46223-submit@debbugs.gnu.org id=B46223.161215858615320 (code B ref 46223); Mon, 01 Feb 2021 05:50:01 +0000 Received: (at 46223) by debbugs.gnu.org; 1 Feb 2021 05:49:46 +0000 Received: from localhost ([127.0.0.1]:58514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6S5p-0003z1-4i for submit@debbugs.gnu.org; Mon, 01 Feb 2021 00:49:46 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:37830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6S5n-0003yi-AK for 46223@debbugs.gnu.org; Mon, 01 Feb 2021 00:49:43 -0500 Received: by mail-pl1-f182.google.com with SMTP id e12so137938pls.4 for <46223@debbugs.gnu.org>; Sun, 31 Jan 2021 21:49:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=cguIUwyAai8PGj3CXErk0h5C52cI349IwYjLam3DhGQ=; b=uZgOsmXMYjeKCSrK8KQn70T5pOxBLVDUFNa7VZpG//sOEppot7eAeIvEnLOu9K5AiL lYG7Wstg3ge09qkrnilAwO5sZVMJoDQWsPigIY3KNp9ZnB/P00dpPB4qnuaulyH27xLl RitDuKLRtAc5YzNkOnEuHZLciLSFYHbFVwcd8dqSQgrbrpYSHApao9XWR7BVnlxVQKXR U16mTarQa5YZ7T5WguA1TEh8G5N423EB9orsciQuu7XCLBnbPXfsNVAZVHkfbB94brfO nZMxtA2uFNWxf5Lkr7bI0QSdmHEY+aps6Bo+RMxTZOw4fSwlJ2gz5VxLFc+PO/6CP78o QwTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=cguIUwyAai8PGj3CXErk0h5C52cI349IwYjLam3DhGQ=; b=PvSCwjZlxNHw7+yRpmtaDUfRJ6BXFVUYX77y2100MUm7Er+uGDPSyiRQn8JlqEDtZH 0EybXBE3cJnpzTh7e+UIlmrKpK3JB57UkCgcQw8Qsq0g2Htd6RIhfEPN25POKl/kgi5s yD9QrYX6dDPNe3YohHd1GbTwHUVcly4YmUNDIAm5QN8EIK0OkNIlLxnBcsQjmEZcpnNh HIAddLytFnjwjzE9As52QaGpz1daWm9zcX8KR2leBQvFUzao4OeX8Msgu0an2Jsrzaco 3RpGOabBARXOPUqVkMlqzZUdYVZ1M9Tz6gqqFYansgYr7pKDCtu1L5kn/+Q0gW2e2igI GXow== X-Gm-Message-State: AOAM531jACwUBHKwL2R20njKQEHdKSe3WRhvPWVWaFcVxarjqn2QctxZ oOWkpz+x9j8Qi/PxmTpG9RtSr2MjYig= X-Google-Smtp-Source: ABdhPJzeehb0LmVd564TdX0bs78WboxfAMCbm44G0FOfxkLUrXGl5yYcIlTwRciX3VZNKQIOxpNpkw== X-Received: by 2002:a17:90a:b703:: with SMTP id l3mr15064212pjr.60.1612158577044; Sun, 31 Jan 2021 21:49:37 -0800 (PST) Received: from navi (137-025-019-170.res.spectrum.com. [137.25.19.170]) by smtp.gmail.com with ESMTPSA id o14sm17693106pgr.44.2021.01.31.21.49.36 for <46223@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 31 Jan 2021 21:49:36 -0800 (PST) From: Evan Straw Date: Sun, 31 Jan 2021 21:49:35 -0800 Message-ID: <8735yg49sg.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=uZgOsmXM; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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-Migadu-Queue-Id: D4E2F9402B5 X-Spam-Score: -3.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: MAba8WjMgMw2 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-opencolorio-Update-to-2.0.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. From=20f981dc8fda53e116097f662c62cb2f1e7d740742 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Sun, 31 Jan 2021 18:38:54 -0800 Subject: [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. * gnu/packages/image-processing.scm (opencolorio): Update to 2.0.0. =2D-- gnu/packages/image-processing.scm | 57 +++++++++---------------------- 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-process= ing.scm index c3ea8491d9..9f3a420eea 100644 =2D-- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages curl) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -70,6 +71,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tbb) #:use-module (gnu packages tls) @@ -173,7 +175,7 @@ of external libraries that provide additional functiona= lity.") (define-public opencolorio (package (name "opencolorio") =2D (version "1.1.1") + (version "2.0.0") (source (origin (method git-fetch) @@ -181,51 +183,27 @@ of external libraries that provide additional functio= nality.") (url "https://github.com/AcademySoftwareFoundation/OpenColorI= O") (commit (string-append "v" version)))) (sha256 =2D (base32 "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb")) =2D (file-name (git-file-name name version)) =2D (modules '((guix build utils))) =2D (snippet =2D `(begin =2D ;; Remove bundled tarballs, patches, and .jars(!). XXX: Upst= ream =2D ;; claims to have fixed USE_EXTERNAL_YAML, but it still fails= with: =2D ;; https://github.com/AcademySoftwareFoundation/OpenColorIO/i= ssues/517 =2D ;; When removing it, also remove it from the licence field co= mment. =2D (for-each delete-file-recursively =2D (filter =2D (lambda (full-name) =2D (let ((file (basename full-name))) =2D (not (or (string-prefix? "yaml-cpp-0.3" file) =2D (string=3D? "unittest.h" file))))) =2D (find-files "ext" ".*"))) =2D =2D #t)))) + (base32 "0888fca8wa5zdc6f7lmh1wi7ljw75ql0rlzaslk2zffd08ij0s38")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags =2D (list (string-append "-DCMAKE_CXX_FLAGS=3D" =2D "-Wno-error=3Ddeprecated-declarations " =2D "-Wno-error=3Dunused-function") =2D "-DOCIO_BUILD_STATIC=3DOFF" =2D ;; "-DUSE_EXTERNAL_YAML=3DON" =2D "-DUSE_EXTERNAL_TINYXML=3DON" =2D "-DUSE_EXTERNAL_LCMS=3DON") =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'patch-test-suite =2D (lambda _ =2D (substitute* "src/core_tests/CMakeLists.txt" =2D (("/bin/sh") (which "bash"))) =2D #t))))) + (list "-DOCIO_INSTALL_EXT_PACKAGES=3DNONE" + (string-append "-Dpystring_ROOT=3D" + (assoc-ref %build-inputs "pystring"))))) (native-inputs `(("git" ,git) =2D ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs =2D ;; XXX Adding freeglut, glew, ilmbase, mesa, and openimageio for =2D ;; ocioconvert fails: error: conflicting declaration ?typedef void =2D ;; (* PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum, GLenum, GLfloat*) `(("lcms" ,lcms) ("openexr" ,openexr) =2D ("tinyxml" ,tinyxml))) + ("tinyxml" ,tinyxml) + ("expat" ,expat) + ("pybind11" ,pybind11) + ("yaml-cpp" ,yaml-cpp) + ("ilmbase" ,ilmbase) + ("pystring" ,pystring))) (home-page "https://opencolorio.org") (synopsis "Color management for visual effects and animation") (description @@ -238,8 +216,7 @@ back-end configuration options suitable for high-end pr= oduction usage. OCIO is compatible with the @acronym{ACES, Academy Color Encoding Specification} and is @acronym{LUT, look-up table}-format agnostic, suppor= ting many popular formats.") =2D (license (list license:expat ; docs/ociotheme/static, ext/yam= l-cpp-* =2D license:zlib ; src/core/md5 + (license (list license:zlib ; src/OpenColorIO/md5 license:bsd-3)))) ; the rest =20 (define-public vtk =2D-=20 2.25.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJLBAEBCAA1FiEE6f/SZXb4DLdwy+VR9TDDtKKp8G0FAmAXlm8XHGV2YW4uc3Ry YXc5OUBnbWFpbC5jb20ACgkQ9TDDtKKp8G2sCxAAgfNHFUXr861I3XcpKHIqJpXW v+BfTxXyAc6mvlAWaT67ri4TBpx+MAIynHpJ0/w2WP9/DszH93vjaVeeMupzPSd2 a9PZeZ+Y/J+YWeeXqTrIVRWm0e23at5UUlclzb6qpeOpfPoKQ93Q5CO+ITgSeSoN tGJloCJpMp2FX4uJVIcxNqvTlOXaohqaCAZ5G4lAWNyGQSrOq9ThCTjiAc57mgBS fwHp/7n9QYUrl6vm9gnVPrx/0S4ICOQqCu0+VA7pVXxfddGwLrNiBDK+VGX6ic04 10YdgzrDaRqa1qc4+y88CnPtwAKnaqc421tK1n5hVj20ybIDRExDCvFabUjK2ubc 2NTAMc4/iwdf5aENGDOLjfUF8cv+k4w2aJAFW9jc61Eq3mKUjUk6hxOUvGyQn1Jb PsTXkRFzyLhWLUTLLQT5oqaNSQGQXk6nJmWAcvlV1IbExi1sVJLCRNNPQofNU0En lNhPuXzcC+ARyMrHg5XNUoPa8NvPrMDprfmLp12Qf5ULCiQbA4GogrNcHjyfEIxj A6s/L0fHlVi1iV7K+174cSxMufe1/6tBX0QABccP3CHPsMsFsPGNcC3UYGn8F9Jb nEpH7DuZxiHebiF6Cg70lzlv8NbF+k7u3ZVb3ogd2b+zyuRwtKwqyMQST5nV8fPk 5eZx9cphS0K6oCoHbbc= =YI/o -----END PGP SIGNATURE----- --==-=-=--