Package: guix-patches;
Reported by: Evan Straw <evan.straw99 <at> gmail.com>
Date: Mon, 1 Feb 2021 05:49:01 UTC
Severity: normal
Tags: patch
Done: Vinicius Monego <monego <at> posteo.net>
To reply to this bug, email your comments to 46223 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#46223; Package guix-patches.
(Mon, 01 Feb 2021 05:49:02 GMT) Full text and rfc822 format available.Evan Straw <evan.straw99 <at> gmail.com>:guix-patches <at> gnu.org.
(Mon, 01 Feb 2021 05:49:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Evan Straw <evan.straw99 <at> gmail.com> To: guix-patches <at> gnu.org Subject: [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. Date: Sun, 31 Jan 2021 21:48:47 -0800
[Message part 1 (text/plain, inline)]
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 <at> gmail.com>
[0001-gnu-Add-pystring.patch (text/x-patch, inline)]
From 3f90b2b1c0e2a1f5266522bdee393a91dba902ac Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99 <at> 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 <at> zrythm.org>
;;; Copyright © 2020, 2021 Greg Hogan <code <at> greghogan.com>
;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
+;;; Copyright © 2021 Evan Straw <evan.straw99 <at> 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
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46223; Package guix-patches.
(Mon, 01 Feb 2021 05:50:01 GMT) Full text and rfc822 format available.Message #8 received at 46223 <at> debbugs.gnu.org (full text, mbox):
From: Evan Straw <evan.straw99 <at> gmail.com> To: 46223 <at> debbugs.gnu.org Subject: [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. Date: Sun, 31 Jan 2021 21:49:35 -0800
[0002-gnu-opencolorio-Update-to-2.0.0.patch (text/x-patch, inline)]
From f981dc8fda53e116097f662c62cb2f1e7d740742 Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99 <at> 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
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46223; Package guix-patches.
(Mon, 01 Feb 2021 08:36:01 GMT) Full text and rfc822 format available.Message #11 received at 46223 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: Evan Straw <evan.straw99 <at> gmail.com> Cc: 46223 <at> debbugs.gnu.org Subject: Re: [bug#46223] [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. Date: Mon, 1 Feb 2021 10:35:02 +0200
[Message part 1 (text/plain, inline)]
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 <at> gmail.com>
> From 3f90b2b1c0e2a1f5266522bdee393a91dba902ac Mon Sep 17 00:00:00 2001
> From: Evan Straw <evan.straw99 <at> 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 <at> zrythm.org>
> ;;; Copyright © 2020, 2021 Greg Hogan <code <at> greghogan.com>
> ;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
> +;;; Copyright © 2021 Evan Straw <evan.straw99 <at> 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 <at> 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
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#46223; Package guix-patches.
(Mon, 01 Feb 2021 08:39:01 GMT) Full text and rfc822 format available.Message #14 received at 46223 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: Evan Straw <evan.straw99 <at> gmail.com> Cc: 46223 <at> debbugs.gnu.org Subject: Re: [bug#46223] [PATCH 2/2] gnu: opencolorio: Update to 2.0.0. Date: Mon, 1 Feb 2021 10:37:40 +0200
[Message part 1 (text/plain, inline)]
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 <at> 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 <at> 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
[signature.asc (application/pgp-signature, inline)]
Vinicius Monego <monego <at> posteo.net>:Evan Straw <evan.straw99 <at> gmail.com>:Message #19 received at 46223-done <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 46223-done <at> debbugs.gnu.org Subject: [PATCH 1/2] gnu: opencolorio: Update to 2.0.0. Date: Sat, 6 Apr 2024 15:53:28 +0000
Hi, I pushed another update to opencolorio as part of a larger series. Closing this one. Vinicius
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.