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 IMaMDy++F2CjWwAA0tVLHw (envelope-from ) for ; Mon, 01 Feb 2021 08:39:11 +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 mHYxCy++F2AdeAAAbx9fmQ (envelope-from ) for ; Mon, 01 Feb 2021 08:39:11 +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 410B89403A6 for ; Mon, 1 Feb 2021 08:39:10 +0000 (UTC) Received: from localhost ([::1]:58324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6Ujl-0006q4-8W for larch@yhetil.org; Mon, 01 Feb 2021 03:39:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6Ujf-0006pw-AO for guix-patches@gnu.org; Mon, 01 Feb 2021 03:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47135) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Ujf-0007EY-2u for guix-patches@gnu.org; Mon, 01 Feb 2021 03:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6Uje-00005Z-11 for guix-patches@gnu.org; Mon, 01 Feb 2021 03:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46223] [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 08:39: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: Evan Straw Received: via spool by 46223-submit@debbugs.gnu.org id=B46223.161216870232753 (code B ref 46223); Mon, 01 Feb 2021 08:39:01 +0000 Received: (at 46223) by debbugs.gnu.org; 1 Feb 2021 08:38:22 +0000 Received: from localhost ([127.0.0.1]:58681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Uiz-0008WD-RV for submit@debbugs.gnu.org; Mon, 01 Feb 2021 03:38:22 -0500 Received: from flashner.co.il ([178.62.234.194]:41360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6Uix-0008Vz-HO for 46223@debbugs.gnu.org; Mon, 01 Feb 2021 03:38:20 -0500 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id A53C94001D; Mon, 1 Feb 2021 08:38:13 +0000 (UTC) Date: Mon, 1 Feb 2021 10:37:40 +0200 From: Efraim Flashner Message-ID: References: <875z3c49ts.fsf@gmail.com> <8735yg49sg.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vHiJtv2CXUaFZ87s" Content-Disposition: inline In-Reply-To: <8735yg49sg.fsf@gmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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: , Cc: 46223@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.96 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: 410B89403A6 X-Spam-Score: -3.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: +XFOM6C0Yl2h --vHiJtv2CXUaFZ87s Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Do both versions of blender build with this version of opencolorio? On Sun, Jan 31, 2021 at 09:49:35PM -0800, Evan Straw wrote: > 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. >=20 > * gnu/packages/image-processing.scm (opencolorio): Update to 2.0.0. There are other changes to the package. the source snippet is removed, custom phase is removed, inputs are changed. They should be mentioned also. > --- > gnu/packages/image-processing.scm | 57 +++++++++---------------------- > 1 file changed, 17 insertions(+), 40 deletions(-) >=20 > diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-proce= ssing.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 functio= nality.") > (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 funct= ionality.") > (url "https://github.com/AcademySoftwareFoundation/OpenColo= rIO") > (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: Upst= ream > - ;; claims to have fixed USE_EXTERNAL_YAML, but it still fails= with: > - ;; https://github.com/AcademySoftwareFoundation/OpenColorIO/i= ssues/517 > - ;; When removing it, also remove it from the licence field co= mment. > - (for-each delete-file-recursively > - (filter > - (lambda (full-name) > - (let ((file (basename full-name))) > - (not (or (string-prefix? "yaml-cpp-0.3" file) > - (string=3D? "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=3D" > - "-Wno-error=3Ddeprecated-declarations " > - "-Wno-error=3Dunused-function") > - "-DOCIO_BUILD_STATIC=3DOFF" > - ;; "-DUSE_EXTERNAL_YAML=3DON" > - "-DUSE_EXTERNAL_TINYXML=3DON" > - "-DUSE_EXTERNAL_LCMS=3DON") > - #: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=3DNONE" > + (string-append "-Dpystring_ROOT=3D" > + (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))) Please sort the inputs alphabetically > (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, supp= orting > many popular formats.") > - (license (list license:expat ; docs/ociotheme/static, ext/yam= l-cpp-* > - license:zlib ; src/core/md5 > + (license (list license:zlib ; src/OpenColorIO/md5 > license:bsd-3)))) ; the rest > =20 > (define-public vtk > --=20 > 2.25.1 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --vHiJtv2CXUaFZ87s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmAXvdQACgkQQarn3Mo9 g1FLwBAApcY+g1VZUTKdwo1dbocbqO8CGzweOv95j9UrgMjO9Ka9SESpeOvoYXB6 XKpG4UC/eG7Ah3djf9N+Ik/GqJyAlBkGf4WC7pa2y1gveSo/c196vrsZgmRZWD4O eZFBVaRUOpc5astRUus5ENImvNKIBOYF0+xqv3DvU/Cg9AkHV8idlG/4J1W9P1Bw R1ow2ppIEZ6iYLvWdII8zviCs8qH4YAsRGkyX9BmOnYokZi40VGlbdmBPHkK3O6v W4xBP+xlXIPAJUAQqSdxiBKOitP9HX/nOxYLSIhhCfkcp5SDnYmBlugBXYxZjYB7 ATKZx/QsDagZx8bH0g52oYFXrQob+A9JTXzt/TJHnKWGxXzpVCB4tzdOp7hm4Sx6 ef2UlqTP9Xu4dEeyvQUeDhb6M/s1z/osRib8MaHwIc5MaZE/UcXcixv5EqYDr+nS rtiYgBJ75xgQC3t4mvl16AdZzFuycoteWt13HdnHzqpcKpWBEgm3yu9Mtp9gpYQv 6+OhTBbUA5vIE0SWcbpvETPV4HCrxWv0ZWBNOc3u1M2Wtt+QJjMYZrcXpFPtCtup NqfzS5kDhnzxnHuKhaOhkQY663CCWmGm5m4vcpvP/5qGw0y6bUCKaiLUn1ntlCqO Z5sspQbcKc21R7a1a/X8wJJ4+oM7ixxzjJP6FpRPtvgXtbpwTKs= =fZQ/ -----END PGP SIGNATURE----- --vHiJtv2CXUaFZ87s--