From patchwork Mon Feb 1 05:49:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Straw X-Patchwork-Id: 26801 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 4C10B27BC24; Mon, 1 Feb 2021 05:50:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,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 ESMTPS id 774F827BC1D for ; Mon, 1 Feb 2021 05:50:17 +0000 (GMT) Received: from localhost ([::1]:35496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6S6K-0002BN-KU for patchwork@mira.cbaines.net; Mon, 01 Feb 2021 00:50:16 -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 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 f981dc8fda53e116097f662c62cb2f1e7d740742 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. --- 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-processing.scm index c3ea8491d9..9f3a420eea 100644 --- 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 functionality.") (define-public opencolorio (package (name "opencolorio") - (version "1.1.1") + (version "2.0.0") (source (origin (method git-fetch) @@ -181,51 +183,27 @@ of external libraries that provide additional functionality.") (url "https://github.com/AcademySoftwareFoundation/OpenColorIO") (commit (string-append "v" version)))) (sha256 - (base32 "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - `(begin - ;; Remove bundled tarballs, patches, and .jars(!). XXX: Upstream - ;; claims to have fixed USE_EXTERNAL_YAML, but it still fails with: - ;; https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/517 - ;; When removing it, also remove it from the licence field comment. - (for-each delete-file-recursively - (filter - (lambda (full-name) - (let ((file (basename full-name))) - (not (or (string-prefix? "yaml-cpp-0.3" file) - (string=? "unittest.h" file))))) - (find-files "ext" ".*"))) - - #t)))) + (base32 "0888fca8wa5zdc6f7lmh1wi7ljw75ql0rlzaslk2zffd08ij0s38")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags - (list (string-append "-DCMAKE_CXX_FLAGS=" - "-Wno-error=deprecated-declarations " - "-Wno-error=unused-function") - "-DOCIO_BUILD_STATIC=OFF" - ;; "-DUSE_EXTERNAL_YAML=ON" - "-DUSE_EXTERNAL_TINYXML=ON" - "-DUSE_EXTERNAL_LCMS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "src/core_tests/CMakeLists.txt" - (("/bin/sh") (which "bash"))) - #t))))) + (list "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + (string-append "-Dpystring_ROOT=" + (assoc-ref %build-inputs "pystring"))))) (native-inputs `(("git" ,git) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs - ;; XXX Adding freeglut, glew, ilmbase, mesa, and openimageio for - ;; ocioconvert fails: error: conflicting declaration ?typedef void - ;; (* PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum, GLenum, GLfloat*) `(("lcms" ,lcms) ("openexr" ,openexr) - ("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 production usage. OCIO is compatible with the @acronym{ACES, Academy Color Encoding Specification} and is @acronym{LUT, look-up table}-format agnostic, supporting many popular formats.") - (license (list license:expat ; docs/ociotheme/static, ext/yaml-cpp-* - license:zlib ; src/core/md5 + (license (list license:zlib ; src/OpenColorIO/md5 license:bsd-3)))) ; the rest (define-public vtk -- 2.25.1