* [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. @ 2021-02-01 5:48 Evan Straw 2021-02-01 5:49 ` [bug#46223] [PATCH 2/2] " Evan Straw ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Evan Straw @ 2021-02-01 5:48 UTC (permalink / raw) To: 46223 [-- Attachment #1.1: Type: text/plain, Size: 354 bytes --] Hello Guix! This is a series of two patches that will update OpenColorIO to v2.0.0, which was released 3 days ago. The first, in this message, will add a dependency for OCIO 2.0.0 and the second, which will be sent soon, will actually update the package. Please let me know if I should make any changes. Thanks, -- Evan Straw <evan.straw99@gmail.com> [-- Attachment #1.2: [PATCH 1/2] gnu: Add pystring. --] [-- Type: text/x-patch, Size: 3556 bytes --] From 3f90b2b1c0e2a1f5266522bdee393a91dba902ac Mon Sep 17 00:00:00 2001 From: Evan Straw <evan.straw99@gmail.com> Date: Sun, 31 Jan 2021 17:07:44 -0800 Subject: [PATCH 1/2] gnu: Add pystring. * gnu/packages/cpp.scm (pystring): New variable. --- gnu/packages/cpp.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ae47490755..9c5269d354 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> +;;; Copyright © 2021 Evan Straw <evan.straw99@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -899,3 +900,57 @@ provides a number of utilities to make coding with expected cleaner.") (description "Magic Enum offers static reflection of enums, with conversions to and from strings, iteration and related functionality.") (license license:expat))) + +(define-public pystring + (package + (name "pystring") + (version "1.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/imageworks/pystring") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + ;; pystring does not have a configure script + (delete 'configure) + ;; Makefile attempts to install to /usr/lib; change this to the + ;; proper output path + (add-before 'install 'fix-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (substitute* "Makefile" + (("LIBDIR = /usr/lib") + (string-append "LIBDIR = " lib))) + (mkdir-p lib) + #t))) + ;; Makefile does not install the header files for the library; + ;; install them to an "include" directory under the proper output + ;; path + (add-after 'install 'install-header + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include/pystring"))) + (mkdir-p inc) + (copy-file "pystring.h" + (string-append inc "/pystring.h")) + #t)))))) + (native-inputs `(("libtool" ,libtool))) + (home-page "https://github.com/imageworks/pystring") + (synopsis "C++ functions matching the interface and behavior of Python +string methods") + (description "Pystring is a collection of C++ functions which match the +interface and behavior of python's string class methods using std::string. +Implemented in C++, it does not require or make use of a python interpreter. +It provides convenience and familiarity for common string operations not +included in the standard C++ library. It's also useful in environments where +both C++ and python are used.") + (license license:bsd-3))) -- 2.25.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 865 bytes --] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#46223] [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. 2021-02-01 5:48 [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0 Evan Straw @ 2021-02-01 5:49 ` Evan Straw 2021-02-01 8:37 ` Efraim Flashner 2021-02-01 8:35 ` [bug#46223] [PATCH 1/2] " Efraim Flashner 2024-04-06 15:53 ` bug#46223: " Vinicius Monego 2 siblings, 1 reply; 5+ messages in thread From: Evan Straw @ 2021-02-01 5:49 UTC (permalink / raw) To: 46223 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.1: [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. --] [-- Type: text/x-patch, Size: 4964 bytes --] From f981dc8fda53e116097f662c62cb2f1e7d740742 Mon Sep 17 00:00:00 2001 From: Evan Straw <evan.straw99@gmail.com> 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 865 bytes --] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#46223] [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. 2021-02-01 5:49 ` [bug#46223] [PATCH 2/2] " Evan Straw @ 2021-02-01 8:37 ` Efraim Flashner 0 siblings, 0 replies; 5+ messages in thread From: Efraim Flashner @ 2021-02-01 8:37 UTC (permalink / raw) To: Evan Straw; +Cc: 46223 [-- Attachment #1: Type: text/plain, Size: 5746 bytes --] 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 <evan.straw99@gmail.com> > 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. 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(-) > > 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))) 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, 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 > -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. 2021-02-01 5:48 [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0 Evan Straw 2021-02-01 5:49 ` [bug#46223] [PATCH 2/2] " Evan Straw @ 2021-02-01 8:35 ` Efraim Flashner 2024-04-06 15:53 ` bug#46223: " Vinicius Monego 2 siblings, 0 replies; 5+ messages in thread From: Efraim Flashner @ 2021-02-01 8:35 UTC (permalink / raw) To: Evan Straw; +Cc: 46223 [-- Attachment #1: Type: text/plain, Size: 5018 bytes --] On Sun, Jan 31, 2021 at 09:48:47PM -0800, Evan Straw wrote: > Hello Guix! > > This is a series of two patches that will update OpenColorIO to v2.0.0, > which was released 3 days ago. The first, in this message, will add a > dependency for OCIO 2.0.0 and the second, which will be sent soon, will > actually update the package. > > Please let me know if I should make any changes. Well, you asked for it :) > Thanks, > -- Evan Straw <evan.straw99@gmail.com> > From 3f90b2b1c0e2a1f5266522bdee393a91dba902ac Mon Sep 17 00:00:00 2001 > From: Evan Straw <evan.straw99@gmail.com> > Date: Sun, 31 Jan 2021 17:07:44 -0800 > Subject: [PATCH 1/2] gnu: Add pystring. > > * gnu/packages/cpp.scm (pystring): New variable. > --- > gnu/packages/cpp.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm > index ae47490755..9c5269d354 100644 > --- a/gnu/packages/cpp.scm > +++ b/gnu/packages/cpp.scm > @@ -16,6 +16,7 @@ > ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> > ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com> > ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> > +;;; Copyright © 2021 Evan Straw <evan.straw99@gmail.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -899,3 +900,57 @@ provides a number of utilities to make coding with expected cleaner.") > (description "Magic Enum offers static reflection of enums, with > conversions to and from strings, iteration and related functionality.") > (license license:expat))) > + > +(define-public pystring > + (package > + (name "pystring") > + (version "1.1.3") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/imageworks/pystring") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf")))) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:phases > + (modify-phases %standard-phases > + ;; pystring does not have a configure script > + (delete 'configure) > + ;; Makefile attempts to install to /usr/lib; change this to the > + ;; proper output path > + (add-before 'install 'fix-install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (lib (string-append out "/lib"))) > + (substitute* "Makefile" > + (("LIBDIR = /usr/lib") > + (string-append "LIBDIR = " lib))) > + (mkdir-p lib) > + #t))) > + ;; Makefile does not install the header files for the library; > + ;; install them to an "include" directory under the proper output > + ;; path > + (add-after 'install 'install-header > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (inc (string-append out "/include/pystring"))) > + (mkdir-p inc) > + (copy-file "pystring.h" > + (string-append inc "/pystring.h")) The source file is pystring.h and the target file is pystring.h, so you can use install-file instead of mkdir-p and copy-file (install-file "pystring.h" inc) A couple of other things: if we don't need the static library (libpystring.a) then we can drop the install size by quite a bit by not installing it. For bonus points, if you want, you can replace the calls to g++ with (cxx-for-target) so it will cross-compile correctly. The chances that someone will want to cross compile blender is low though. > + #t)))))) > + (native-inputs `(("libtool" ,libtool))) > + (home-page "https://github.com/imageworks/pystring") > + (synopsis "C++ functions matching the interface and behavior of Python > +string methods") > + (description "Pystring is a collection of C++ functions which match the > +interface and behavior of python's string class methods using std::string. @code{std::string} Also Python is a proper noun so it should be capitalized > +Implemented in C++, it does not require or make use of a python interpreter. > +It provides convenience and familiarity for common string operations not > +included in the standard C++ library. It's also useful in environments where > +both C++ and python are used.") > + (license license:bsd-3))) > -- > 2.25.1 > -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#46223: [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. 2021-02-01 5:48 [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0 Evan Straw 2021-02-01 5:49 ` [bug#46223] [PATCH 2/2] " Evan Straw 2021-02-01 8:35 ` [bug#46223] [PATCH 1/2] " Efraim Flashner @ 2024-04-06 15:53 ` Vinicius Monego 2 siblings, 0 replies; 5+ messages in thread From: Vinicius Monego @ 2024-04-06 15:53 UTC (permalink / raw) To: 46223-done Hi, I pushed another update to opencolorio as part of a larger series. Closing this one. Vinicius ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-06 15:55 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-02-01 5:48 [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0 Evan Straw 2021-02-01 5:49 ` [bug#46223] [PATCH 2/2] " Evan Straw 2021-02-01 8:37 ` Efraim Flashner 2021-02-01 8:35 ` [bug#46223] [PATCH 1/2] " Efraim Flashner 2024-04-06 15:53 ` bug#46223: " Vinicius Monego
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).