all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Vinicius Monego <monego@posteo.net>
To: 70035@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#70035] [PATCH 6/8] gnu: opencolorio: Update to 2.3.2.
Date: Wed, 27 Mar 2024 17:17:46 +0000	[thread overview]
Message-ID: <eb83ac5e36a0eb3522b8990dd14899dcdf4185c2.1711551246.git.monego@posteo.net> (raw)
In-Reply-To: <cover.1711551246.git.monego@posteo.net>

* 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





  parent reply	other threads:[~2024-03-27 17:20 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-27 17:15 [bug#70035] [PATCH 0/8] Update and cleanup ASWF tools Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 1/8] gnu: openimageio: Update to 2.5.9.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 2/8] gnu: openshadinglanguage: Update to 1.13.7.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 3/8] gnu: Add partio Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 4/8] gnu: Add pystring Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 5/8] gnu: Add minizip-ng Vinicius Monego
2024-03-27 17:17 ` Vinicius Monego [this message]
2024-03-27 17:17 ` [bug#70035] [PATCH 7/8] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-03-27 17:17 ` [bug#70035] [PATCH 8/8] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-03-28 15:40 ` [bug#70035] [PATCH v2 0/8] Update and cleanup ASWF tools Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 1/8] gnu: openimageio: Update to 2.5.9.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 2/8] gnu: openshadinglanguage: Update to 1.13.7.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 3/8] gnu: Add partio Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 4/8] gnu: Add pystring Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 5/8] gnu: Add minizip-ng Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 6/8] gnu: opencolorio: Update to 2.3.2 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 7/8] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-03-28 15:40   ` [bug#70035] [PATCH v2 8/8] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-04-03  1:30 ` [bug#70035] [PATCH v3 0/9] Update and cleanup ASWF tools Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 1/9] gnu: openimageio: Update to 2.5.10.1 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 2/9] gnu: openshadinglanguage: Update to 1.13.8.0 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 3/9] gnu: Add partio Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 4/9] gnu: Add pystring Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 5/9] gnu: Add minizip-ng Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 6/9] gnu: opencolorio: Update to 2.3.2 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 7/9] gnu: openvdb: Update to 11.0.0 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 8/9] gnu: opensubdiv: Update to 3.6.0 Vinicius Monego
2024-04-03  1:30   ` [bug#70035] [PATCH v3 9/9] gnu: blender: Update to 3.6.10 Vinicius Monego
2024-04-03 22:04     ` Vinicius Monego
2024-04-06 15:50 ` bug#70035: [PATCH 0/8] Update and cleanup ASWF tools Vinicius Monego

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eb83ac5e36a0eb3522b8990dd14899dcdf4185c2.1711551246.git.monego@posteo.net \
    --to=monego@posteo.net \
    --cc=70035@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.