From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QCCVN+KPBWb50gAA62LTzQ:P1 (envelope-from ) for ; Thu, 28 Mar 2024 16:42:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id QCCVN+KPBWb50gAA62LTzQ (envelope-from ) for ; Thu, 28 Mar 2024 16:42:27 +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=dwNM6KiK; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711640546; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=Oxft0dO5qiXB4smkY/pl8clQIrFyTDs9NcVlJ6lI6QY=; b=U8sfAwMhXniykZzzwF34/3n3i9no+G/2x8jzP7TtG5qNc0w0m8H+4qnpAILGkwf6gh0hYn OioQ8IUAJNXfbHdWcUoGw3bfZQtrOSr6Y1XApfqLRAVluxIDvazTQijJnnBUzdHNmePVmQ OZToIe6vOiid1KN+jvP8Cp7/DE8cVBGNfJpkvBgSXOuoT9Efwy3Vh8Td82jg9HhslcXTnp /vmVfic2xZvxkEOHstwPkmiV7JijHazSJnTL64atu82eM9+Pc9CmXPb/28F+K3JEgggPov k5BsRyInPqAnARZa3AwgWAOBwokd3I4KBNnTmqnzLpRJuy4g/KCY3snaECufAQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=dwNM6KiK; 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"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711640546; a=rsa-sha256; cv=none; b=GNCLi886aS62ixjuaqMTvC1hXoOkscHubgby51mRSgixWZdIZ+1xWs+3nnekPIaWqlVwHq bhtlgmhV8U+wAjA3bJ9BtR1drNV3q523LY4UHFoQkJE8sz8skxTejaR0zZtf2csMnWv+ft p2QH4sYsE7gi9ugzk1Uu+Y2fz8sdbZBltiHxmjD/h7V8A5dnOw3u+3CBh428jChapFLnhO mRG3sA2fY3OgwicFiruPYS0Euj0KjaM+uh1mHkl+gqrxzrWaNN1hgAMCW4te6gw2z5F58z oNPBbRanQ9f1vHWbAv6QRsLXO33zOO4o70bDJjmIipAo5rrgkXZO+SZYTIsAGg== 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 A67723C3DE for ; Thu, 28 Mar 2024 16:42:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtQ-0004J4-Jh; Thu, 28 Mar 2024 11:42:16 -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 1rprtG-0003We-Hp for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:08 -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 1rprtG-0007ZV-29 for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtG-0003Vw-QN for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42:06 +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.171164051013370 (code B ref 70035); Thu, 28 Mar 2024 15:42:06 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:50 +0000 Received: from localhost ([127.0.0.1]:40949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsy-0003TO-UU for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:42937) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsp-0003RT-LT for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4264F240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640493; bh=KssVuWivIFFCt4OU01uracvGnQjzwUV/ASiXckGN3Lc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=dwNM6KiKvRFHXZRl1DJg8sIeKthnYBE+peUKLQs2or5sTBQWeNZDlCoFYGn4yQmX3 lQv2PVc0/43iaLondoVr05UmvXpxeSBWxIzqZZfbt/2hoNipD4ns5VUdgJS16ieslC bhT5auXVfN25gTV0kFAktz9xi/QZKIOwahxYk46XTGKOaLizNb/mYEhqwCA6amaua0 ZajXrzvh9j65GepSCe0Z4n6IUO+FI3xWifbuVMddkxzmvEmlHE4F5aPM1XDuYmZ8EJ YbYxNv3jHAM7eP4cBBZHm53sr/+oqCwLGUdfqtuyC+XCprKKiewXB3Trc+fpUfGPck XibO+B8AjP+kw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V577J3DCSz6tyV; Thu, 28 Mar 2024 16:41:32 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:46 +0000 Message-Id: <30626bad8bacab181be1a8ac988267c0b63c1682.1711639886.git.monego@posteo.net> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Migadu-Queue-Id: A67723C3DE X-Spam-Score: -4.45 X-Migadu-Spam-Score: -4.45 X-Migadu-Scanner: mx11.migadu.com X-TUID: d95QINuL4RGm * 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. * gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Unregister it. Change-Id: Iafd87762df81d0f5c23089251b4241a57d414dc4 --- gnu/local.mk | 1 - gnu/packages/image-processing.scm | 63 ++++++------------- .../opencolorio-fix-build-with-gcc11.patch | 37 ----------- 3 files changed, 20 insertions(+), 81 deletions(-) delete mode 100644 gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5429dc498c..9eb61ecb80 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1756,7 +1756,6 @@ dist_patch_DATA = \ %D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-mpc.patch \ %D%/packages/patches/openbox-python3.patch \ - %D%/packages/patches/opencolorio-fix-build-with-gcc11.patch \ %D%/packages/patches/openjdk-currency-time-bomb.patch \ %D%/packages/patches/openjdk-currency-time-bomb2.patch \ %D%/packages/patches/openjdk-9-pointer-comparison.patch \ 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 diff --git a/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch b/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch deleted file mode 100644 index 06507db206..0000000000 --- a/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix build failure with GCC 11: - ------- -[...] -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:60:51: error: ‘this’ pointer is null [-Werror=nonnull] - 60 | os << "width=" << packedImg->getWidth() << ", "; - | ^ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:274:10: note: in a call to non-static member function ‘long int OpenColorIO::v1::PackedImageDesc::getWidth() const’ - 274 | long PackedImageDesc::getWidth() const - | ^~~~~~~~~~~~~~~ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:61:53: error: ‘this’ pointer is null [-Werror=nonnull] - 61 | os << "height=" << packedImg->getHeight() << ", "; - | ^ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:279:10: note: in a call to non-static member function ‘long int OpenColorIO::v1::PackedImageDesc::getHeight() const’ - 279 | long PackedImageDesc::getHeight() const - | ^~~~~~~~~~~~~~~ -cc1plus: all warnings being treated as errors -[...] ------- - -Patch copied from Gentoo: - -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e726d850502018b6760da78dbd4a419603016b8 - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 1eb691b6..cff9bd83 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -23,8 +23,6 @@ if(WIN32) - if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") - endif() --else() -- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror") - endif() - - # SHARED -- 2.39.2