Package: guix-patches;
Reported by: Vinicius Monego <monego <at> posteo.net>
Date: Wed, 27 Mar 2024 17:16:02 UTC
Severity: normal
Tags: patch
Done: Vinicius Monego <monego <at> posteo.net>
To reply to this bug, email your comments to 70035 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#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:16:03 GMT) Full text and rfc822 format available.Vinicius Monego <monego <at> posteo.net>:guix-patches <at> gnu.org.
(Wed, 27 Mar 2024 17:16:03 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: guix-patches <at> gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 0/8] Update and cleanup ASWF tools. Date: Wed, 27 Mar 2024 17:15:05 +0000
I couldn't build OpenVDB, it exceeded my memory. Hopefully it builds fine in the CI. Vinicius Monego (8): gnu: openimageio: Update to 2.5.9.0. gnu: openshadinglanguage: Update to 1.13.7.0. gnu: Add partio. gnu: Add pystring. gnu: Add minizip-ng. gnu: opencolorio: Update to 2.3.2. gnu: openvdb: Update to 11.0.0. gnu: opensubdiv: Update to 3.6.0. gnu/packages/compression.scm | 27 +++++ gnu/packages/cpp.scm | 41 +++++++- gnu/packages/graphics.scm | 161 +++++++++++++++++------------- gnu/packages/image-processing.scm | 63 ++++-------- 4 files changed, 180 insertions(+), 112 deletions(-) base-commit: 232796ce60288b877d6908de06c02b4861cd53bf -- 2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:19:01 GMT) Full text and rfc822 format available.Message #8 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 1/8] gnu: openimageio: Update to 2.5.9.0. Date: Wed, 27 Mar 2024 17:17:41 +0000
* gnu/packages/graphics.scm (openimageio): Update to 2.5.9.0.
[source]: Adjust tag prefix.
[inputs]: Replace openexr-2 with openexr, fmt-8 with fmt. Use package labels.
Change-Id: I7016f89c5b7c78cbc1ffeac23e5c0cefe2a8f43b
---
gnu/packages/graphics.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 9bc81a3a81..fcc7886b34 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1313,16 +1313,16 @@ (define-public openexr-2
(define-public openimageio
(package
(name "openimageio")
- (version "2.2.21.0")
+ (version "2.5.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenImageIO/oiio")
- (commit (string-append "Release-" version))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr"))))
+ "1djqna387vargrvf6dl53bsb7j36lvah4l9fvj0818s4sjkw4npd"))))
(build-system cmake-build-system)
;; FIXME: To run all tests successfully, test image sets from multiple
;; third party sources have to be present. For details see
@@ -1333,20 +1333,19 @@ (define-public openimageio
(native-inputs
(list pkg-config))
(inputs
- `(("boost" ,boost)
- ("fmt" ,fmt-8)
- ("libheif" ,libheif)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)
- ("libtiff" ,libtiff)
- ("giflib" ,giflib)
- ("openexr" ,openexr-2)
- ("ilmbase" ,ilmbase)
- ("pugixml" ,pugixml)
- ("python" ,python-wrapper)
- ("pybind11" ,pybind11)
- ("robin-map" ,robin-map)
- ("zlib" ,zlib)))
+ (list boost
+ fmt
+ libheif
+ libpng
+ libjpeg-turbo
+ libtiff
+ giflib
+ openexr
+ imath
+ pugixml
+ python-wrapper
+ pybind11
+ robin-map))
(synopsis "C++ library for reading and writing images")
(description
"OpenImageIO is a library for reading and writing images, and a bunch of
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:19:02 GMT) Full text and rfc822 format available.Message #11 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 2/8] gnu: openshadinglanguage: Update to 1.13.7.0. Date: Wed, 27 Mar 2024 17:17:42 +0000
* gnu/packages/graphics.scm (openshadinglanguage): Update to 1.13.7.0.
[source]: Add patch.
[arguments]: Use G-Expressions. In #:configure-flags, pass the
"-DLLVM_BC_GENERATOR" option. Delete the add-ilmbase-include-path phase. Add
new tests to skip.
[native-inputs]: Use Clang 13 and LLVM 13.
[inputs]: Use OpenEXR 3 and Qt 6.
Change-Id: Ib3e7ed39c3eb170e3d24ccc74243ebff490e07ab
---
gnu/packages/graphics.scm | 64 ++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index fcc7886b34..50786e594b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -707,7 +707,7 @@ (define-public mikktspace
(define-public openshadinglanguage
(package
(name "openshadinglanguage")
- (version "1.11.16.0")
+ (version "1.13.7.0")
(source
(origin
(method git-fetch)
@@ -716,52 +716,46 @@ (define-public openshadinglanguage
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g"))))
+ (base32 "0nb7kc7kh6k71wda3nzcwpiycx8lknl08y0c7ns6p7f4fab7kh1k"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged
- #:phases
- (modify-phases %standard-phases
- (add-after 'set-paths 'add-ilmbase-include-path
- (lambda* (#:key inputs #:allow-other-keys)
- ;; OpenEXR 2 propagates ilmbase, but its include files do not
- ;; appear in the C_INCLUDE_PATH.
- (let ((headers (string-append
- (assoc-ref inputs "ilmbase")
- "/include/OpenEXR")))
- (setenv "C_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "C_INCLUDE_PATH") "")))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "CPLUS_INCLUDE_PATH") ""))))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest" "--exclude-regex"
- (string-join
- (list
- "osl-imageio" ; OIIO not compiled with freetype
- "osl-imageio.opt" ; OIIO not compiled with freetype
- "texture-udim" ; file does not exist
- "texture-udim.opt" ; file does not exist
- "example-deformer" ; could not find OSLConfig
- "python-oslquery") ; no module oslquery
- "|"))))))))
+ (list #:configure-flags
+ #~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged
+ (string-append "-DLLVM_BC_GENERATOR="
+ #$(this-package-native-input "clang")
+ "/bin/clang++"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke
+ "ctest" "--exclude-regex"
+ (string-join
+ (list
+ "osl-imageio" ; file does not exist
+ "osl-imageio.opt" ; file does not exist
+ "osl-imageio.opt.rs_bitcode" ; file does not exist
+ "texture-udim" ; file does not exist
+ "texture-udim.opt" ; file does not exist
+ "texture-udim.opt.rs_bitcode" ; file does not exist
+ "example-deformer" ; could not find OSLConfig
+ "python-oslquery") ; no module oslquery
+ "|"))))))))
(native-inputs
(list bison
- clang-9
+ clang
flex
- llvm-9
+ llvm
pybind11
python-wrapper))
(inputs
(list boost
imath
- openexr-2
+ openexr
openimageio
pugixml
- qtbase-5
+ qtbase
zlib))
(home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
(synopsis "Shading language for production GI renderers")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:19:03 GMT) Full text and rfc822 format available.Message #14 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 3/8] gnu: Add partio. Date: Wed, 27 Mar 2024 17:17:43 +0000
* gnu/packages/graphics.scm (partio): New variable.
Change-Id: I680eebd45a3d38853a5907ee444f1ca4d54f2a44
---
gnu/packages/graphics.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 50786e594b..55d87524db 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1519,6 +1519,43 @@ (define-public openmw-openscenegraph
#~(modify-phases #$phases
(delete 'copy-plugins)))))))))
+(define-public partio
+ (package
+ (name "partio")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wdas/partio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m0hrhzy3wlh5qi4rjkxrlcvgc1q41nqr2rwl6j07arr3z4mnpy1"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'set-LDFLAGS
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (setenv "LDFLAGS"
+ (string-append
+ "-Wl,-rpath="
+ (assoc-ref outputs "out") "/lib")))))))
+ (native-inputs
+ (list python-wrapper swig))
+ (inputs
+ (list freeglut
+ libglvnd
+ zlib))
+ (home-page "https://partio.us/")
+ (synopsis "Library for particle IO and manipulation")
+ (description
+ "Partio is a C++ library for reading, writing and manipulating a variety
+of standard particle formats (GEO, BGEO, PTC, PDB, PDA). It has a Python API
+and a collection of simple command-line tools.")
+ (license license:bsd-3)))
+
(define-public povray
(package
(name "povray")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:19:03 GMT) Full text and rfc822 format available.Message #17 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 4/8] gnu: Add pystring. Date: Wed, 27 Mar 2024 17:17:44 +0000
* gnu/packages/cpp.scm (pystring): New variable.
Change-Id: Ifff1ae3d3ed8ec880a2dd098d6d81de28d7bdda6
---
gnu/packages/cpp.scm | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index acbe3e4836..02445eecea 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020 Roel Janssen <roel <at> gnu.org>
;;; Copyright © 2020, 2021, 2023, 2024 Ricardo Wurmus <rekado <at> elephly.net>
;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
-;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020, 2021, 2022, 2024 Vinicius Monego <monego <at> posteo.net>
;;; Copyright © 2020, 2022 Marius Bakke <marius <at> gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
;;; Copyright © 2020 Alexandros Theodotou <alex <at> zrythm.org>
@@ -477,6 +477,45 @@ (define-public rct
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
+(define-public pystring
+ (package
+ (name "pystring")
+ (version "1.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/imageworks/pystring")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0h12x24skrlx4fv0k5vl8wnar8gi6bq091yp93awkwsbnm8qwkzd"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; The install phase doesn't install the header
+ (add-after 'install 'install-header
+ (lambda _
+ (mkdir-p (string-append #$output "/include"))
+ (copy-file
+ (string-append #$(package-source this-package)
+ "/pystring.h")
+ (string-append #$output
+ "/include/pystring.h")))))))
+ (native-inputs (list pkg-config))
+ (home-page "https://github.com/aseba-community/dashel")
+ (synopsis "C++ functions matching the 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)))
+
(define-public dashel
(package
(name "dashel")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:19:03 GMT) Full text and rfc822 format available.Message #20 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 5/8] gnu: Add minizip-ng. Date: Wed, 27 Mar 2024 17:17:45 +0000
* gnu/packages/compression.scm (minizip-ng): New variable.
Change-Id: I429dc542c1610383962c9971c2bef5a94c1f8bc6
---
gnu/packages/compression.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 5de17b6b51..02a20e5c62 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -38,6 +38,7 @@
;;; Copyright © 2022 Greg Hogan <code <at> greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo <at> hotmail.com>
+;;; Copyright © 2024 Vinicius Monego <monego <at> posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -769,6 +770,32 @@ (define-public sfarklib
with the sfArk algorithm.")
(license license:gpl3+)))
+(define-public minizip-ng
+ (package
+ (name "minizip-ng")
+ (version "4.0.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zlib-ng/minizip-ng")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lgx4s4aykxn8x3b4m4c4isasd2608bbyfm4lxc2spcc4xqwhzkz"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
+ "-DMZ_BUILD_TESTS=ON"
+ "-DMZ_BUILD_UNIT_TESTS=ON")))
+ (native-inputs (list googletest pkg-config))
+ (inputs (list openssl zlib `(,zstd "lib")))
+ (home-page "https://github.com/zlib-ng/minizip-ng")
+ (synopsis "Zip manipulation library")
+ (description "@code{minizip-ng} is a zip manipulation library written in
+C, forked from the zip manipulation library found in the zlib distribution.")
+ (license license:bsd-3)))
+
(define-public sfarkxtc
(let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463")
(revision "1"))
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:20:03 GMT) Full text and rfc822 format available.Message #23 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 6/8] gnu: opencolorio: Update to 2.3.2. Date: Wed, 27 Mar 2024 17:17:46 +0000
* 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
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:20:03 GMT) Full text and rfc822 format available.Message #26 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 7/8] gnu: openvdb: Update to 11.0.0. Date: Wed, 27 Mar 2024 17:17:47 +0000
* gnu/packages/graphics.scm (openvdb): Update to 11.0.0.
[inputs]: Add jemalloc. Remove ilmbase.
Change-Id: Ia8b248c1171c62344ff6da924afa5f4d83cd8d49
---
gnu/packages/graphics.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 55d87524db..a794d378a3 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -461,7 +461,7 @@ (define-public embree
(define-public openvdb
(package
(name "openvdb")
- (version "8.2.0")
+ (version "11.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -471,14 +471,14 @@ (define-public openvdb
(file-name (git-file-name name version))
(sha256
(base32
- "0856697hnwk8xsp29kx8y2p1kliy0bdwfsznxm38v4690vna15rk"))))
+ "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))))
(inputs
- (list boost c-blosc ilmbase tbb zlib))
+ (list boost c-blosc jemalloc tbb zlib))
(native-inputs
(list pkg-config))
(home-page "https://www.openvdb.org/")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 27 Mar 2024 17:20:04 GMT) Full text and rfc822 format available.Message #29 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 8/8] gnu: opensubdiv: Update to 3.6.0. Date: Wed, 27 Mar 2024 17:17:48 +0000
* gnu/packages/graphics.scm (opensubdiv): Update to 3.6.0.
[arguments]: Use G-Expressions. Delete the set-glew-location phase.
Change-Id: Ie37f70a5146e5072b362a4439d0669ea19ca2869
---
gnu/packages/graphics.scm | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index a794d378a3..ad253cab49 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1913,7 +1913,7 @@ (define-public fgallery
(define-public opensubdiv
(package
(name "opensubdiv")
- (version "3.4.0")
+ (version "3.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1923,20 +1923,15 @@ (define-public opensubdiv
(file-name (git-file-name name version))
(sha256
(base32
- "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12"))))
+ "0h9scxiigijzlpv4r0s0nhxlndhv1cmarb2bqgmlwcln1jjvlb4n"))))
(build-system cmake-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'set-glew-location
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "GLEW_LOCATION" (assoc-ref inputs "glew"))
- #t))
- (add-before 'check 'start-xorg-server
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The test suite requires a running X server.
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- #t)))))
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'start-xorg-server
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The test suite requires a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
(native-inputs
(list xorg-server-for-tests))
(inputs
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:03 GMT) Full text and rfc822 format available.Message #32 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 0/8] Update and cleanup ASWF tools. Date: Thu, 28 Mar 2024 15:40:40 +0000
Further clarification about this series: * Moved old dependencies to more recent versions (e.g. openexr-2 to openexr 3.x). * Used G-Expressions in the arguments. * Added new packages that are dependencies to the latest version of opencolorio. * Lots of simplification (deleted phases that are not necessary anymore, removed patches). Changes in this v2: * pystring: Enabled tests, changed home-page, added double spaces in the description sentences. * partio: Restyled arguments and inputs * opencolorio: Deleted and unregistered unused patch. * openimageio: Reintroduced zlib as a dependency Vinicius Monego (8): gnu: openimageio: Update to 2.5.9.0. gnu: openshadinglanguage: Update to 1.13.7.0. gnu: Add partio. gnu: Add pystring. gnu: Add minizip-ng. gnu: opencolorio: Update to 2.3.2. gnu: openvdb: Update to 11.0.0. gnu: opensubdiv: Update to 3.6.0. gnu/local.mk | 1 - gnu/packages/compression.scm | 27 +++ gnu/packages/cpp.scm | 40 ++++- gnu/packages/graphics.scm | 157 ++++++++++-------- gnu/packages/image-processing.scm | 63 +++---- .../opencolorio-fix-build-with-gcc11.patch | 37 ----- 6 files changed, 175 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch base-commit: 232796ce60288b877d6908de06c02b4861cd53bf -- 2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:03 GMT) Full text and rfc822 format available.Message #35 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 1/8] gnu: openimageio: Update to 2.5.9.0. Date: Thu, 28 Mar 2024 15:40:41 +0000
* gnu/packages/graphics.scm (openimageio): Update to 2.5.9.0.
[source]: Adjust tag prefix.
[inputs]: Replace openexr-2 with openexr, fmt-8 with fmt. Use package labels.
Change-Id: I7016f89c5b7c78cbc1ffeac23e5c0cefe2a8f43b
---
gnu/packages/cpp.scm | 2 +-
gnu/packages/graphics.scm | 34 +++++++++++++++++-----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index acbe3e4836..2c04920166 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020 Roel Janssen <roel <at> gnu.org>
;;; Copyright © 2020, 2021, 2023, 2024 Ricardo Wurmus <rekado <at> elephly.net>
;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
-;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020, 2021, 2022, 2024 Vinicius Monego <monego <at> posteo.net>
;;; Copyright © 2020, 2022 Marius Bakke <marius <at> gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
;;; Copyright © 2020 Alexandros Theodotou <alex <at> zrythm.org>
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 9bc81a3a81..e10e157f61 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1313,16 +1313,16 @@ (define-public openexr-2
(define-public openimageio
(package
(name "openimageio")
- (version "2.2.21.0")
+ (version "2.5.9.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenImageIO/oiio")
- (commit (string-append "Release-" version))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr"))))
+ "1djqna387vargrvf6dl53bsb7j36lvah4l9fvj0818s4sjkw4npd"))))
(build-system cmake-build-system)
;; FIXME: To run all tests successfully, test image sets from multiple
;; third party sources have to be present. For details see
@@ -1333,20 +1333,20 @@ (define-public openimageio
(native-inputs
(list pkg-config))
(inputs
- `(("boost" ,boost)
- ("fmt" ,fmt-8)
- ("libheif" ,libheif)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)
- ("libtiff" ,libtiff)
- ("giflib" ,giflib)
- ("openexr" ,openexr-2)
- ("ilmbase" ,ilmbase)
- ("pugixml" ,pugixml)
- ("python" ,python-wrapper)
- ("pybind11" ,pybind11)
- ("robin-map" ,robin-map)
- ("zlib" ,zlib)))
+ (list boost
+ fmt
+ libheif
+ libpng
+ libjpeg-turbo
+ libtiff
+ giflib
+ openexr
+ imath
+ pugixml
+ python-wrapper
+ pybind11
+ robin-map
+ zlib))
(synopsis "C++ library for reading and writing images")
(description
"OpenImageIO is a library for reading and writing images, and a bunch of
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:04 GMT) Full text and rfc822 format available.Message #38 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 2/8] gnu: openshadinglanguage: Update to 1.13.7.0. Date: Thu, 28 Mar 2024 15:40:42 +0000
* gnu/packages/graphics.scm (openshadinglanguage): Update to 1.13.7.0.
[source]: Add patch.
[arguments]: Use G-Expressions. In #:configure-flags, pass the
"-DLLVM_BC_GENERATOR" option. Delete the add-ilmbase-include-path phase. Add
new tests to skip.
[native-inputs]: Use Clang 13 and LLVM 13.
[inputs]: Use OpenEXR 3 and Qt 6.
Change-Id: Ib3e7ed39c3eb170e3d24ccc74243ebff490e07ab
---
gnu/packages/graphics.scm | 64 ++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e10e157f61..20b783f01d 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -707,7 +707,7 @@ (define-public mikktspace
(define-public openshadinglanguage
(package
(name "openshadinglanguage")
- (version "1.11.16.0")
+ (version "1.13.7.0")
(source
(origin
(method git-fetch)
@@ -716,52 +716,46 @@ (define-public openshadinglanguage
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g"))))
+ (base32 "0nb7kc7kh6k71wda3nzcwpiycx8lknl08y0c7ns6p7f4fab7kh1k"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged
- #:phases
- (modify-phases %standard-phases
- (add-after 'set-paths 'add-ilmbase-include-path
- (lambda* (#:key inputs #:allow-other-keys)
- ;; OpenEXR 2 propagates ilmbase, but its include files do not
- ;; appear in the C_INCLUDE_PATH.
- (let ((headers (string-append
- (assoc-ref inputs "ilmbase")
- "/include/OpenEXR")))
- (setenv "C_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "C_INCLUDE_PATH") "")))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "CPLUS_INCLUDE_PATH") ""))))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest" "--exclude-regex"
- (string-join
- (list
- "osl-imageio" ; OIIO not compiled with freetype
- "osl-imageio.opt" ; OIIO not compiled with freetype
- "texture-udim" ; file does not exist
- "texture-udim.opt" ; file does not exist
- "example-deformer" ; could not find OSLConfig
- "python-oslquery") ; no module oslquery
- "|"))))))))
+ (list #:configure-flags
+ #~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged
+ (string-append "-DLLVM_BC_GENERATOR="
+ #$(this-package-native-input "clang")
+ "/bin/clang++"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke
+ "ctest" "--exclude-regex"
+ (string-join
+ (list
+ "osl-imageio" ; file does not exist
+ "osl-imageio.opt" ; file does not exist
+ "osl-imageio.opt.rs_bitcode" ; file does not exist
+ "texture-udim" ; file does not exist
+ "texture-udim.opt" ; file does not exist
+ "texture-udim.opt.rs_bitcode" ; file does not exist
+ "example-deformer" ; could not find OSLConfig
+ "python-oslquery") ; no module oslquery
+ "|"))))))))
(native-inputs
(list bison
- clang-9
+ clang
flex
- llvm-9
+ llvm
pybind11
python-wrapper))
(inputs
(list boost
imath
- openexr-2
+ openexr
openimageio
pugixml
- qtbase-5
+ qtbase
zlib))
(home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
(synopsis "Shading language for production GI renderers")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:05 GMT) Full text and rfc822 format available.Message #41 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 3/8] gnu: Add partio. Date: Thu, 28 Mar 2024 15:40:43 +0000
* gnu/packages/graphics.scm (partio): New variable.
Change-Id: I680eebd45a3d38853a5907ee444f1ca4d54f2a44
---
gnu/packages/graphics.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 20b783f01d..aea8f3b972 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1520,6 +1520,38 @@ (define-public openmw-openscenegraph
#~(modify-phases #$phases
(delete 'copy-plugins)))))))))
+(define-public partio
+ (package
+ (name "partio")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wdas/partio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m0hrhzy3wlh5qi4rjkxrlcvgc1q41nqr2rwl6j07arr3z4mnpy1"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'set-LDFLAGS
+ (lambda _
+ (setenv "LDFLAGS"
+ (string-append
+ "-Wl,-rpath=" #$output "/lib")))))))
+ (native-inputs (list python-wrapper swig))
+ (inputs (list freeglut libglvnd zlib))
+ (home-page "https://partio.us/")
+ (synopsis "Library for particle IO and manipulation")
+ (description
+ "Partio is a C++ library for reading, writing and manipulating a variety
+of standard particle formats (GEO, BGEO, PTC, PDB, PDA). It has a Python API
+and a collection of simple command-line tools.")
+ (license license:bsd-3)))
+
(define-public povray
(package
(name "povray")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:06 GMT) Full text and rfc822 format available.Message #44 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 4/8] gnu: Add pystring. Date: Thu, 28 Mar 2024 15:40:44 +0000
* gnu/packages/cpp.scm (pystring): New variable.
Change-Id: Ifff1ae3d3ed8ec880a2dd098d6d81de28d7bdda6
---
gnu/packages/cpp.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 2c04920166..7c3c35e048 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -477,6 +477,44 @@ (define-public rct
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
+(define-public pystring
+ (package
+ (name "pystring")
+ (version "1.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/imageworks/pystring")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0h12x24skrlx4fv0k5vl8wnar8gi6bq091yp93awkwsbnm8qwkzd"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; The install phase doesn't install the header
+ (add-after 'install 'install-header
+ (lambda _
+ (mkdir-p (string-append #$output "/include"))
+ (copy-file
+ (string-append #$(package-source this-package)
+ "/pystring.h")
+ (string-append #$output
+ "/include/pystring.h")))))))
+ (native-inputs (list pkg-config))
+ (home-page "https://github.com/imageworks/pystring")
+ (synopsis "C++ functions matching the 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)))
+
(define-public dashel
(package
(name "dashel")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:06 GMT) Full text and rfc822 format available.Message #47 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 5/8] gnu: Add minizip-ng. Date: Thu, 28 Mar 2024 15:40:45 +0000
* gnu/packages/compression.scm (minizip-ng): New variable.
Change-Id: I429dc542c1610383962c9971c2bef5a94c1f8bc6
---
gnu/packages/compression.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 5de17b6b51..02a20e5c62 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -38,6 +38,7 @@
;;; Copyright © 2022 Greg Hogan <code <at> greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo <at> hotmail.com>
+;;; Copyright © 2024 Vinicius Monego <monego <at> posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -769,6 +770,32 @@ (define-public sfarklib
with the sfArk algorithm.")
(license license:gpl3+)))
+(define-public minizip-ng
+ (package
+ (name "minizip-ng")
+ (version "4.0.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zlib-ng/minizip-ng")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lgx4s4aykxn8x3b4m4c4isasd2608bbyfm4lxc2spcc4xqwhzkz"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
+ "-DMZ_BUILD_TESTS=ON"
+ "-DMZ_BUILD_UNIT_TESTS=ON")))
+ (native-inputs (list googletest pkg-config))
+ (inputs (list openssl zlib `(,zstd "lib")))
+ (home-page "https://github.com/zlib-ng/minizip-ng")
+ (synopsis "Zip manipulation library")
+ (description "@code{minizip-ng} is a zip manipulation library written in
+C, forked from the zip manipulation library found in the zlib distribution.")
+ (license license:bsd-3)))
+
(define-public sfarkxtc
(let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463")
(revision "1"))
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:06 GMT) Full text and rfc822 format available.Message #50 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 6/8] gnu: opencolorio: Update to 2.3.2. Date: Thu, 28 Mar 2024 15:40:46 +0000
* 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
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:07 GMT) Full text and rfc822 format available.Message #53 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 7/8] gnu: openvdb: Update to 11.0.0. Date: Thu, 28 Mar 2024 15:40:47 +0000
* gnu/packages/graphics.scm (openvdb): Update to 11.0.0.
[inputs]: Add jemalloc. Remove ilmbase.
Change-Id: Ia8b248c1171c62344ff6da924afa5f4d83cd8d49
---
gnu/packages/graphics.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index aea8f3b972..5915ecc329 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -461,7 +461,7 @@ (define-public embree
(define-public openvdb
(package
(name "openvdb")
- (version "8.2.0")
+ (version "11.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -471,14 +471,14 @@ (define-public openvdb
(file-name (git-file-name name version))
(sha256
(base32
- "0856697hnwk8xsp29kx8y2p1kliy0bdwfsznxm38v4690vna15rk"))))
+ "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))))
(inputs
- (list boost c-blosc ilmbase tbb zlib))
+ (list boost c-blosc jemalloc tbb zlib))
(native-inputs
(list pkg-config))
(home-page "https://www.openvdb.org/")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Thu, 28 Mar 2024 15:42:07 GMT) Full text and rfc822 format available.Message #56 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 8/8] gnu: opensubdiv: Update to 3.6.0. Date: Thu, 28 Mar 2024 15:40:48 +0000
* gnu/packages/graphics.scm (opensubdiv): Update to 3.6.0.
[arguments]: Use G-Expressions. Delete the set-glew-location phase.
Change-Id: Ie37f70a5146e5072b362a4439d0669ea19ca2869
---
gnu/packages/graphics.scm | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 5915ecc329..f7519c3abf 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1909,7 +1909,7 @@ (define-public fgallery
(define-public opensubdiv
(package
(name "opensubdiv")
- (version "3.4.0")
+ (version "3.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1919,20 +1919,15 @@ (define-public opensubdiv
(file-name (git-file-name name version))
(sha256
(base32
- "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12"))))
+ "0h9scxiigijzlpv4r0s0nhxlndhv1cmarb2bqgmlwcln1jjvlb4n"))))
(build-system cmake-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'set-glew-location
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "GLEW_LOCATION" (assoc-ref inputs "glew"))
- #t))
- (add-before 'check 'start-xorg-server
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The test suite requires a running X server.
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- #t)))))
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'start-xorg-server
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The test suite requires a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
(native-inputs
(list xorg-server-for-tests))
(inputs
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:02 GMT) Full text and rfc822 format available.Message #59 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 0/9] Update and cleanup ASWF tools. Date: Wed, 3 Apr 2024 01:30:20 +0000
Blender was failing in the QA so I gave it an update. I didn't finish building, but it passed the point where it was failing. Krita was failing too but it was updated to a new version after v2. Also did some minor version updates. Vinicius Monego (9): gnu: openimageio: Update to 2.5.10.1. gnu: openshadinglanguage: Update to 1.13.8.0. gnu: Add partio. gnu: Add pystring. gnu: Add minizip-ng. gnu: opencolorio: Update to 2.3.2. gnu: openvdb: Update to 11.0.0. gnu: opensubdiv: Update to 3.6.0. gnu: blender: Update to 3.6.10. gnu/local.mk | 1 - gnu/packages/compression.scm | 27 +++ gnu/packages/cpp.scm | 40 +++- gnu/packages/graphics.scm | 208 +++++++++--------- gnu/packages/image-processing.scm | 63 ++---- .../opencolorio-fix-build-with-gcc11.patch | 37 ---- 6 files changed, 185 insertions(+), 191 deletions(-) delete mode 100644 gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch base-commit: 4d79a9cd6b5f0d8c5afbab0c6b70ae42740d5470 -- 2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:02 GMT) Full text and rfc822 format available.Message #62 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 1/9] gnu: openimageio: Update to 2.5.10.1. Date: Wed, 3 Apr 2024 01:30:21 +0000
* gnu/packages/graphics.scm (openimageio): Update to 2.5.10.1.
[source]: Adjust tag prefix.
[arguments]: Use G-Expressions.
<#:configure-flags>: Pass "-DOIIO_BUILD_TESTS=false".
[inputs]: Replace openexr-2 with openexr, fmt-8 with fmt. Use package labels.
Change-Id: I7016f89c5b7c78cbc1ffeac23e5c0cefe2a8f43b
---
gnu/packages/cpp.scm | 2 +-
gnu/packages/graphics.scm | 42 +++++++++++++++++++--------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index acbe3e4836..2c04920166 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020 Roel Janssen <roel <at> gnu.org>
;;; Copyright © 2020, 2021, 2023, 2024 Ricardo Wurmus <rekado <at> elephly.net>
;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
-;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020, 2021, 2022, 2024 Vinicius Monego <monego <at> posteo.net>
;;; Copyright © 2020, 2022 Marius Bakke <marius <at> gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
;;; Copyright © 2020 Alexandros Theodotou <alex <at> zrythm.org>
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index ad08141c96..23b6af066a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1313,40 +1313,38 @@ (define-public openexr-2
(define-public openimageio
(package
(name "openimageio")
- (version "2.2.21.0")
+ (version "2.5.10.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenImageIO/oiio")
- (commit (string-append "Release-" version))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr"))))
+ "06x3lqj9qjh5m0zbr5g2g9ii6jk340pgzrhr4fb353y1y2pkx5sw"))))
(build-system cmake-build-system)
- ;; FIXME: To run all tests successfully, test image sets from multiple
- ;; third party sources have to be present. For details see
- ;; <https://github.com/OpenImageIO/oiio/blob/master/INSTALL.md>
(arguments
- `(#:tests? #f
- #:configure-flags (list "-DUSE_EXTERNAL_PUGIXML=1")))
+ (list #:tests? #f ; half the tests require online data or use redirection
+ #:configure-flags #~(list "-DUSE_EXTERNAL_PUGIXML=1"
+ "-DOIIO_BUILD_TESTS=false")))
(native-inputs
(list pkg-config))
(inputs
- `(("boost" ,boost)
- ("fmt" ,fmt-8)
- ("libheif" ,libheif)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)
- ("libtiff" ,libtiff)
- ("giflib" ,giflib)
- ("openexr" ,openexr-2)
- ("ilmbase" ,ilmbase)
- ("pugixml" ,pugixml)
- ("python" ,python-wrapper)
- ("pybind11" ,pybind11)
- ("robin-map" ,robin-map)
- ("zlib" ,zlib)))
+ (list boost
+ fmt
+ libheif
+ libpng
+ libjpeg-turbo
+ libtiff
+ giflib
+ openexr
+ imath
+ pugixml
+ python-wrapper
+ pybind11
+ robin-map
+ zlib))
(synopsis "C++ library for reading and writing images")
(description
"OpenImageIO is a library for reading and writing images, and a bunch of
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:03 GMT) Full text and rfc822 format available.Message #65 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 2/9] gnu: openshadinglanguage: Update to 1.13.8.0. Date: Wed, 3 Apr 2024 01:30:22 +0000
* gnu/packages/graphics.scm (openshadinglanguage): Update to 1.13.8.0.
[source]: Add patch.
[arguments]: Use G-Expressions. In #:configure-flags, pass the
"-DLLVM_BC_GENERATOR" option. Delete the add-ilmbase-include-path phase. Add
new tests to skip.
[native-inputs]: Use Clang 13 and LLVM 13.
[inputs]: Use OpenEXR 3 and Qt 6.
Change-Id: Ib3e7ed39c3eb170e3d24ccc74243ebff490e07ab
---
gnu/packages/graphics.scm | 64 ++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 23b6af066a..b593f03690 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -707,7 +707,7 @@ (define-public mikktspace
(define-public openshadinglanguage
(package
(name "openshadinglanguage")
- (version "1.11.16.0")
+ (version "1.13.8.0")
(source
(origin
(method git-fetch)
@@ -716,52 +716,46 @@ (define-public openshadinglanguage
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g"))))
+ (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged
- #:phases
- (modify-phases %standard-phases
- (add-after 'set-paths 'add-ilmbase-include-path
- (lambda* (#:key inputs #:allow-other-keys)
- ;; OpenEXR 2 propagates ilmbase, but its include files do not
- ;; appear in the C_INCLUDE_PATH.
- (let ((headers (string-append
- (assoc-ref inputs "ilmbase")
- "/include/OpenEXR")))
- (setenv "C_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "C_INCLUDE_PATH") "")))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "CPLUS_INCLUDE_PATH") ""))))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest" "--exclude-regex"
- (string-join
- (list
- "osl-imageio" ; OIIO not compiled with freetype
- "osl-imageio.opt" ; OIIO not compiled with freetype
- "texture-udim" ; file does not exist
- "texture-udim.opt" ; file does not exist
- "example-deformer" ; could not find OSLConfig
- "python-oslquery") ; no module oslquery
- "|"))))))))
+ (list #:configure-flags
+ #~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged
+ (string-append "-DLLVM_BC_GENERATOR="
+ #$(this-package-native-input "clang")
+ "/bin/clang++"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke
+ "ctest" "--exclude-regex"
+ (string-join
+ (list
+ "osl-imageio" ; file does not exist
+ "osl-imageio.opt" ; file does not exist
+ "osl-imageio.opt.rs_bitcode" ; file does not exist
+ "texture-udim" ; file does not exist
+ "texture-udim.opt" ; file does not exist
+ "texture-udim.opt.rs_bitcode" ; file does not exist
+ "example-deformer" ; could not find OSLConfig
+ "python-oslquery") ; no module oslquery
+ "|"))))))))
(native-inputs
(list bison
- clang-9
+ clang
flex
- llvm-9
+ llvm
pybind11
python-wrapper))
(inputs
(list boost
imath
- openexr-2
+ openexr
openimageio
pugixml
- qtbase-5
+ qtbase
zlib))
(home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
(synopsis "Shading language for production GI renderers")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:03 GMT) Full text and rfc822 format available.Message #68 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 3/9] gnu: Add partio. Date: Wed, 3 Apr 2024 01:30:23 +0000
* gnu/packages/graphics.scm (partio): New variable.
Change-Id: I680eebd45a3d38853a5907ee444f1ca4d54f2a44
---
gnu/packages/graphics.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index b593f03690..360a1c89f1 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1518,6 +1518,38 @@ (define-public openmw-openscenegraph
#~(modify-phases #$phases
(delete 'copy-plugins)))))))))
+(define-public partio
+ (package
+ (name "partio")
+ (version "1.17.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wdas/partio")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1m0hrhzy3wlh5qi4rjkxrlcvgc1q41nqr2rwl6j07arr3z4mnpy1"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'set-LDFLAGS
+ (lambda _
+ (setenv "LDFLAGS"
+ (string-append
+ "-Wl,-rpath=" #$output "/lib")))))))
+ (native-inputs (list python-wrapper swig))
+ (inputs (list freeglut libglvnd zlib))
+ (home-page "https://partio.us/")
+ (synopsis "Library for particle IO and manipulation")
+ (description
+ "Partio is a C++ library for reading, writing and manipulating a variety
+of standard particle formats (GEO, BGEO, PTC, PDB, PDA). It has a Python API
+and a collection of simple command-line tools.")
+ (license license:bsd-3)))
+
(define-public povray
(package
(name "povray")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:04 GMT) Full text and rfc822 format available.Message #71 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 4/9] gnu: Add pystring. Date: Wed, 3 Apr 2024 01:30:24 +0000
* gnu/packages/cpp.scm (pystring): New variable.
Change-Id: Ifff1ae3d3ed8ec880a2dd098d6d81de28d7bdda6
---
gnu/packages/cpp.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 2c04920166..7c3c35e048 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -477,6 +477,44 @@ (define-public rct
(license (list license:expat ; cJSON
license:bsd-4))))) ; everything else (LICENSE.txt)
+(define-public pystring
+ (package
+ (name "pystring")
+ (version "1.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/imageworks/pystring")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0h12x24skrlx4fv0k5vl8wnar8gi6bq091yp93awkwsbnm8qwkzd"))
+ (file-name (git-file-name name version))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; The install phase doesn't install the header
+ (add-after 'install 'install-header
+ (lambda _
+ (mkdir-p (string-append #$output "/include"))
+ (copy-file
+ (string-append #$(package-source this-package)
+ "/pystring.h")
+ (string-append #$output
+ "/include/pystring.h")))))))
+ (native-inputs (list pkg-config))
+ (home-page "https://github.com/imageworks/pystring")
+ (synopsis "C++ functions matching the 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)))
+
(define-public dashel
(package
(name "dashel")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:04 GMT) Full text and rfc822 format available.Message #74 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 5/9] gnu: Add minizip-ng. Date: Wed, 3 Apr 2024 01:30:25 +0000
* gnu/packages/compression.scm (minizip-ng): New variable.
Change-Id: I429dc542c1610383962c9971c2bef5a94c1f8bc6
---
gnu/packages/compression.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 5de17b6b51..02a20e5c62 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -38,6 +38,7 @@
;;; Copyright © 2022 Greg Hogan <code <at> greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo <at> hotmail.com>
+;;; Copyright © 2024 Vinicius Monego <monego <at> posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -769,6 +770,32 @@ (define-public sfarklib
with the sfArk algorithm.")
(license license:gpl3+)))
+(define-public minizip-ng
+ (package
+ (name "minizip-ng")
+ (version "4.0.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zlib-ng/minizip-ng")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lgx4s4aykxn8x3b4m4c4isasd2608bbyfm4lxc2spcc4xqwhzkz"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
+ "-DMZ_BUILD_TESTS=ON"
+ "-DMZ_BUILD_UNIT_TESTS=ON")))
+ (native-inputs (list googletest pkg-config))
+ (inputs (list openssl zlib `(,zstd "lib")))
+ (home-page "https://github.com/zlib-ng/minizip-ng")
+ (synopsis "Zip manipulation library")
+ (description "@code{minizip-ng} is a zip manipulation library written in
+C, forked from the zip manipulation library found in the zlib distribution.")
+ (license license:bsd-3)))
+
(define-public sfarkxtc
(let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463")
(revision "1"))
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:05 GMT) Full text and rfc822 format available.Message #77 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 6/9] gnu: opencolorio: Update to 2.3.2. Date: Wed, 3 Apr 2024 01:30:26 +0000
* 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 f2b480bded..3a78b71d66 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1765,7 +1765,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
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:05 GMT) Full text and rfc822 format available.Message #80 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 7/9] gnu: openvdb: Update to 11.0.0. Date: Wed, 3 Apr 2024 01:30:27 +0000
* gnu/packages/graphics.scm (openvdb): Update to 11.0.0.
[inputs]: Add jemalloc. Remove ilmbase.
Change-Id: Ia8b248c1171c62344ff6da924afa5f4d83cd8d49
---
gnu/packages/graphics.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 360a1c89f1..8fda96e6e6 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -461,7 +461,7 @@ (define-public embree
(define-public openvdb
(package
(name "openvdb")
- (version "8.2.0")
+ (version "11.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -471,14 +471,14 @@ (define-public openvdb
(file-name (git-file-name name version))
(sha256
(base32
- "0856697hnwk8xsp29kx8y2p1kliy0bdwfsznxm38v4690vna15rk"))))
+ "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))))
(inputs
- (list boost c-blosc ilmbase tbb zlib))
+ (list boost c-blosc jemalloc tbb zlib))
(native-inputs
(list pkg-config))
(home-page "https://www.openvdb.org/")
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:05 GMT) Full text and rfc822 format available.Message #83 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 8/9] gnu: opensubdiv: Update to 3.6.0. Date: Wed, 3 Apr 2024 01:30:28 +0000
* gnu/packages/graphics.scm (opensubdiv): Update to 3.6.0.
[arguments]: Use G-Expressions. Delete the set-glew-location phase.
Change-Id: Ie37f70a5146e5072b362a4439d0669ea19ca2869
---
gnu/packages/graphics.scm | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8fda96e6e6..555800e517 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1907,7 +1907,7 @@ (define-public fgallery
(define-public opensubdiv
(package
(name "opensubdiv")
- (version "3.4.0")
+ (version "3.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1917,20 +1917,15 @@ (define-public opensubdiv
(file-name (git-file-name name version))
(sha256
(base32
- "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12"))))
+ "0h9scxiigijzlpv4r0s0nhxlndhv1cmarb2bqgmlwcln1jjvlb4n"))))
(build-system cmake-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'set-glew-location
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "GLEW_LOCATION" (assoc-ref inputs "glew"))
- #t))
- (add-before 'check 'start-xorg-server
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The test suite requires a running X server.
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- #t)))))
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'start-xorg-server
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The test suite requires a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
(native-inputs
(list xorg-server-for-tests))
(inputs
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 01:32:06 GMT) Full text and rfc822 format available.Message #86 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v3 9/9] gnu: blender: Update to 3.6.10. Date: Wed, 3 Apr 2024 01:30:29 +0000
* gnu/packages/graphics.scm (blender): Update to 3.6.10.
[arguments]<#:configure-flags>: Unset "-DPYTHON_LIBRARY", "-DPYTHON_LIBPATH",
"-DPYTHON_VERSION", "-DPYTHON_NUMPY_INCLUDE_DIRS", "-DPYTHON_NUMPY_PATH",
"-DCMAKE_CXX_FLAGS".
[inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase
with imath, openexr-2 with openexr.
Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed
---
gnu/packages/graphics.scm | 43 +++++++--------------------------------
1 file changed, 7 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 555800e517..fc99da8a12 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -493,14 +493,14 @@ (define-public openvdb
(define-public blender
(package
(name "blender")
- (version "3.3.5") ;3.3.x is the current LTS version
+ (version "3.6.10") ;3.6.x is the current LTS version
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz"))
(sha256
(base32
- "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
+ "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs"))))
(build-system cmake-build-system)
(arguments
(list
@@ -520,48 +520,19 @@ (define-public blender
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_OPENVDB=ON"
"-DWITH_OPENSUBDIV=ON"
- "-DWITH_PYTHON_INSTALL=OFF"
- (string-append "-DPYTHON_LIBRARY=python" #$python-version)
- (string-append "-DPYTHON_LIBPATH="
- (assoc-ref %build-inputs "python")
- "/lib")
- (string-append "-DPYTHON_INCLUDE_DIR="
- (assoc-ref %build-inputs "python")
- "/include/python" #$python-version)
- (string-append "-DPYTHON_VERSION=" #$python-version)
- (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
- (assoc-ref %build-inputs "python-numpy")
- "/lib/python" #$python-version
- "/site-packages/numpy/core/include/")
- (string-append "-DPYTHON_NUMPY_PATH="
- (assoc-ref %build-inputs "python-numpy")
- "/lib/python" #$python-version
- "/site-packages/")
- ;; OpenEXR propagates ilmbase, but its include files do not
- ;; appear in the C_INCLUDE_PATH, so we need to add
- ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to
- ;; satisfy the dependency on "half.h" and "Iex.h".
- (string-append "-DCMAKE_CXX_FLAGS=-I"
- (search-input-directory %build-inputs
- "include/OpenEXR"))))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-broken-import
- (lambda _
- (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
- (("import encode_bin")
- "from . import encode_bin")))))))
+ "-DWITH_PYTHON_INSTALL=OFF"))))
(inputs
(list boost
embree
ffmpeg-5
fftw
- freetype
+ freetype-with-brotli
glew
gmp ;needed for boolean operations on meshes
- ilmbase
+ imath
jack-1
jemalloc
+ libepoxy
libjpeg-turbo
libpng
libsndfile
@@ -571,7 +542,7 @@ (define-public blender
libxrender
openal
opencolorio
- openexr-2
+ openexr
openimageio
openjpeg
opensubdiv
--
2.39.2
guix-patches <at> gnu.org:bug#70035; Package guix-patches.
(Wed, 03 Apr 2024 22:06:02 GMT) Full text and rfc822 format available.Message #89 received at 70035 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035 <at> debbugs.gnu.org Subject: Re: [PATCH v3 9/9] gnu: blender: Update to 3.6.10. Date: Wed, 3 Apr 2024 22:04:46 +0000
I reintroduced the configure flags removed from Blender, rebuilt it
locally and it's building again, and the application launches. I will
push the series in the coming days.
Em 02/04/2024 22:30, Vinicius Monego escreveu:
> * gnu/packages/graphics.scm (blender): Update to 3.6.10.
> [arguments]<#:configure-flags>: Unset "-DPYTHON_LIBRARY", "-DPYTHON_LIBPATH",
> "-DPYTHON_VERSION", "-DPYTHON_NUMPY_INCLUDE_DIRS", "-DPYTHON_NUMPY_PATH",
> "-DCMAKE_CXX_FLAGS".
> [inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase
> with imath, openexr-2 with openexr.
>
> Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed
> ---
> gnu/packages/graphics.scm | 43 +++++++--------------------------------
> 1 file changed, 7 insertions(+), 36 deletions(-)
>
> diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> index 555800e517..fc99da8a12 100644
> --- a/gnu/packages/graphics.scm
> +++ b/gnu/packages/graphics.scm
> @@ -493,14 +493,14 @@ (define-public openvdb
> (define-public blender
> (package
> (name "blender")
> - (version "3.3.5") ;3.3.x is the current LTS version
> + (version "3.6.10") ;3.6.x is the current LTS version
> (source (origin
> (method url-fetch)
> (uri (string-append "https://download.blender.org/source/"
> "blender-" version ".tar.xz"))
> (sha256
> (base32
> - "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
> + "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs"))))
> (build-system cmake-build-system)
> (arguments
> (list
> @@ -520,48 +520,19 @@ (define-public blender
> "-DWITH_MOD_OCEANSIM=ON"
> "-DWITH_OPENVDB=ON"
> "-DWITH_OPENSUBDIV=ON"
> - "-DWITH_PYTHON_INSTALL=OFF"
> - (string-append "-DPYTHON_LIBRARY=python" #$python-version)
> - (string-append "-DPYTHON_LIBPATH="
> - (assoc-ref %build-inputs "python")
> - "/lib")
> - (string-append "-DPYTHON_INCLUDE_DIR="
> - (assoc-ref %build-inputs "python")
> - "/include/python" #$python-version)
> - (string-append "-DPYTHON_VERSION=" #$python-version)
> - (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
> - (assoc-ref %build-inputs "python-numpy")
> - "/lib/python" #$python-version
> - "/site-packages/numpy/core/include/")
> - (string-append "-DPYTHON_NUMPY_PATH="
> - (assoc-ref %build-inputs "python-numpy")
> - "/lib/python" #$python-version
> - "/site-packages/")
> - ;; OpenEXR propagates ilmbase, but its include files do not
> - ;; appear in the C_INCLUDE_PATH, so we need to add
> - ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to
> - ;; satisfy the dependency on "half.h" and "Iex.h".
> - (string-append "-DCMAKE_CXX_FLAGS=-I"
> - (search-input-directory %build-inputs
> - "include/OpenEXR"))))
> - #:phases
> - #~(modify-phases %standard-phases
> - (add-after 'unpack 'fix-broken-import
> - (lambda _
> - (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
> - (("import encode_bin")
> - "from . import encode_bin")))))))
> + "-DWITH_PYTHON_INSTALL=OFF"))))
> (inputs
> (list boost
> embree
> ffmpeg-5
> fftw
> - freetype
> + freetype-with-brotli
> glew
> gmp ;needed for boolean operations on meshes
> - ilmbase
> + imath
> jack-1
> jemalloc
> + libepoxy
> libjpeg-turbo
> libpng
> libsndfile
> @@ -571,7 +542,7 @@ (define-public blender
> libxrender
> openal
> opencolorio
> - openexr-2
> + openexr
> openimageio
> openjpeg
> opensubdiv
Vinicius Monego <monego <at> posteo.net>:Vinicius Monego <monego <at> posteo.net>:Message #94 received at 70035-done <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 70035-done <at> debbugs.gnu.org Subject: [PATCH 0/8] Update and cleanup ASWF tools. Date: Sat, 6 Apr 2024 15:50:33 +0000
[Message part 1 (text/plain, inline)]
Series pushed with a few more minor changes. Closing.
[Message part 2 (text/html, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.