From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6DSaIF5VBGbJRQAA62LTzQ:P1 (envelope-from ) for ; Wed, 27 Mar 2024 18:20:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6DSaIF5VBGbJRQAA62LTzQ (envelope-from ) for ; Wed, 27 Mar 2024 18:20:30 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=ADWW7HjO; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711560030; a=rsa-sha256; cv=none; b=cNtH9iBivSlED2hvrSOBbBnHNTgUN8Zvliq8qOSOiazlKJNHZITEKG2g9pzo8ydNQzGJV5 swiqTCkQZ47kJm28OiZp0u+wFA8uvQ678KUUfMFUjNnLnkxRy5Vg1rkur1soDbZIwtU5UV jmv5P/YyThvt5pu/FgqT1C3W5FW96YuLeSTrBUxhRYu4dlvzLv4SiVU9hCGsABDy9M82f3 u58hqNTtSbF+fjKqDKTGU1PxCRT1YliBFRcRqHMcu9R8zDrb0TLQ+5GXK1wz4llsTF40m2 pdB44yXQBi0gLyCZ8CtZLbaneAZniJNUPV5vaooEL2nhN9F6o2DaOzSCbC6Ysw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=ADWW7HjO; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711560030; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9GTCS1MBB0utV8nCHLQOTOXy0l6/VvgiCvfMs0jQtIw=; b=kmGi1S3US9P4hoE7cfJVnQvMgJtPOd/NBpP9m1P23RSRvqEGcUMl9DXS0yDMSjapAA/TJK k6WwAGWdFUN0q9W0JH7ih2BCCMUgJ2VqjpaPZhxh5zWhXKGlQ6xy7XSTU4dIMhHMKqfT+L w0p4OIiQF/aCTukgUyOH5OCyiPGyqDqBz62gBM0iHo7q8YNWLEZVmN4Bx7XuokLgaLVjSL thDBb8AnUhzr2XmjtVOX/1AwHREuXEJUvHWztUorofIJUXxx0pM/RAC/nyebMHXzylR9tT FD0Ym8bjXJ2b28i2qMHV+YNaN90aSEVGNihbuYymDGo38qsdVkIFnp4qE5FpeQ== 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 4D1BA1C452 for ; Wed, 27 Mar 2024 18:20:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWwX-0000Uc-U3; Wed, 27 Mar 2024 13:20:05 -0400 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 1rpWwV-0000UG-8z for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWwU-0006te-VY for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWwV-00038L-35 for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 6/8] gnu: opencolorio: Update to 2.3.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.171155995111742 (code B ref 70035); Wed, 27 Mar 2024 17:20:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:11 +0000 Received: from localhost ([127.0.0.1]:38298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWve-00033I-Lb for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvX-000312-L3 for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C9EC7240027 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559937; bh=xnMmVSXF3A3A8587TJmSIA68R7OElUxbVFo0IEAn40U=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=ADWW7HjOCu15AJ8mb3rxztd/KUqbaLIiBKglt2b9Qc0oWVri6uPwwlgunBKALenSl cqx5MIgGuKZ1LrdJ3+HFc4qIdIRxnHLjFsXYwlDMTB9ijWm+HT8J1LiMI0uk+r38l6 dMAkZZayIFiOVeL1BnGOcMcRKBo+xSWxGG+pEVLwvJEDBXIwEVmpkmtb3RCNzBigEF rHdtHMApNK4+Q8yP/emmjoRYCzv+fQOGz8sxfD7on8FqvRS3NTQiZAdyA8THNqVivf reGdLD4k4pntrlMWW29jxOe8DbK/++yo0VZjkq/0nPSEX9rZxoymIzuzI13ZTbDKLw z9rFFu1RZWchw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YL85xPSz9rxL; Wed, 27 Mar 2024 18:18:56 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:46 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 3.95 X-Migadu-Queue-Id: 4D1BA1C452 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 3.95 X-TUID: Koi5Hr+8vqRy * gnu/packages/image-processing.scm (opencolorio): Update to 2.3.2. [source]: Remove snippet. [arguments]<#:configure-flags>: Unset "-DCMAKE-CXX_FLAGS", "DOCIO_BUILD_STATIC", "-DUSE_EXTERNAL_TINXML", "-DUSE_EXTERNAL_LCMS". Add "-DCIO_BUILD_GPU_TESTS=false". <#:phases>: Delete the patch-test-suite phase. [native-inputs]: Remove git, pkg-config. Add openimageio, pybind11-2.10, python-wrapper. [inputs]: Remove openexr-2, tinyxml. Add expat, freeglut, glew, imath, libglvnd, minizip-ng, openexr, pystring, yaml-cpp, zlib. [license]: Simplify. Change-Id: Iafd87762df81d0f5c23089251b4241a57d414dc4 --- gnu/packages/image-processing.scm | 63 ++++++++++--------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9d16109b05..8afe50a57a 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -260,57 +260,36 @@ (define-public mia (define-public opencolorio (package (name "opencolorio") - (version "1.1.1") + (version "2.3.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/AcademySoftwareFoundation/OpenColorIO") (commit (string-append "v" version)))) - (patches (search-patches "opencolorio-fix-build-with-gcc11.patch")) (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 "1h33s2pfy28nj836kx6xx3iks7v38g3kx7c4f6zn1dpskl0zf809")) + (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))))) + ;; XXX: GPU tests are failing. + (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false"))) (native-inputs - (list git pkg-config)) + ;; XXX: OCIO has unit tests for openshadinglanguage, but they fail. + ;; Add openshadinglanguage to native-inputs to build them. + (list openimageio pybind11-2.10 python-wrapper)) (inputs - ;; XXX Adding freeglut, glew, ilmbase, mesa, and openimageio for - ;; ocioconvert fails: error: conflicting declaration ?typedef void - ;; (* PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum, GLenum, GLfloat*) - (list lcms openexr-2 tinyxml)) + (list expat + freeglut + glew + imath + lcms + libglvnd + minizip-ng + openexr + pystring + yaml-cpp + zlib)) (home-page "https://opencolorio.org") (synopsis "Color management for visual effects and animation") (description @@ -323,9 +302,7 @@ (define-public opencolorio 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:bsd-3)))) ; the rest + (license (list license:bsd-3)))) (define-public vtk (package -- 2.39.2