[PR PATCH] New package: imath-3.1.5

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] New package: imath-3.1.5
@ 2022-10-09 21:45 motorto
  2022-10-09 22:03 ` [PR PATCH] [Updated] " motorto
                   ` (50 more replies)
  0 siblings, 51 replies; 52+ messages in thread
From: motorto @ 2022-10-09 21:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

There is a new pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

New package: imath-3.1.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 2721 bytes --]

From 6cab7254c11c535a2b9d2cdf183b8a9c42c1dfdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 9 Oct 2022 22:25:57 +0100
Subject: [PATCH] New package: imath-3.1.5

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 4ff73dace83f..50e2fdafc25d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4184,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..642f7b958b83
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,39 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ONE"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] New package: imath-3.1.5
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
@ 2022-10-09 22:03 ` motorto
  2022-10-15 11:46 ` motorto
                   ` (49 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-09 22:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

New package: imath-3.1.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 2744 bytes --]

From 0527625066ca8cce506365fd7735e641f60b0b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 9 Oct 2022 22:25:57 +0100
Subject: [PATCH] New package: imath-3.1.5

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 4ff73dace83f..50e2fdafc25d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4184,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..d530077293f0
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] New package: imath-3.1.5
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
  2022-10-09 22:03 ` [PR PATCH] [Updated] " motorto
@ 2022-10-15 11:46 ` motorto
  2022-10-15 17:31 ` motorto
                   ` (48 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-15 11:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

New package: imath-3.1.5
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


[ci-skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 25089 bytes --]

From 64cb4cff6c35eedc1529bd556a858c99580485c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 1/7] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 8194333576fb..a6642447f022 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4185,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..8b782608ac1b
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 01ff0b4e416bc13c016eb1a3290f5806109d3744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 2/7] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a6642447f022..39947bfa53cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 60655f69f2524b5613eeea3b5de15fcdaae1e039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 3/7] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 39947bfa53cb..c95d4cbf1f3b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4181,3 +4179,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From fb1f6ed6c36a7dec81f3ae9963d7a323aaba0066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 4/7] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 7cefd43eb93360b982345d327489602470a3344b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 5/7] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 63e7d794703b20efd5f7a07bc3223bc44ec8462a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 6/7] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 35d3e6b6eb2aee3248ddaf1c8cf900c68c68cca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 7/7] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: New package: imath-3.1.5
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
  2022-10-09 22:03 ` [PR PATCH] [Updated] " motorto
  2022-10-15 11:46 ` motorto
@ 2022-10-15 17:31 ` motorto
  2022-10-15 17:39 ` [PR PATCH] [Updated] openexr3.0 update motorto
                   ` (47 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-15 17:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1279789027

Comment:
Need some help with making gmic build with openexr3.0 (and without the ilmbase package).

Inspired myself on the fedora patch: https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch

But it fails and I am not familiarized enough with the package. logs:  https://paste.rs/7MP

Here is my current "patch" (not working). https://paste.rs/HSS


^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (2 preceding siblings ...)
  2022-10-15 17:31 ` motorto
@ 2022-10-15 17:39 ` motorto
  2022-10-16 13:38 ` motorto
                   ` (46 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-15 17:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


[ci-skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 27492 bytes --]

From 5e96b977c515e420e51312029ad74b63d48257d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 1/9] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8194333576fb..ab897a694d1f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3881,7 +3881,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..3053f40d750a 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="zlib-devel ilmbase-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 1565c72c825bbfa5865a887570754e111f061215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:06:18 +0100
Subject: [PATCH 2/9] blender: revbump for alembic update

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 48d5972c4ff750cc2764ff7db440f29fef763cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 3/9] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index ab897a694d1f..2cb72c02bc49 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4185,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..8b782608ac1b
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From c3c9cbd92a3824cce974b0cfd207b8be36cbce58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 4/9] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 2cb72c02bc49..0a00eb48e55d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From af9c20b92dd663950561b5729a677bbff9627d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 5/9] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 0a00eb48e55d..60a90903b6c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4181,3 +4179,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From a8623a7b7a83a3935574925eab58d29fffe3007c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 6/9] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 63c474e6c7437076f9fb48be4240bdef8cdb5763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 7/9] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From b18f3a471176556bb9c02a45af4573da615b26f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 8/9] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From fb9fb83740f7be194c9ee5b867f2aeb8d92624e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 9/9] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (3 preceding siblings ...)
  2022-10-15 17:39 ` [PR PATCH] [Updated] openexr3.0 update motorto
@ 2022-10-16 13:38 ` motorto
  2022-10-16 13:43 ` lemmi
                   ` (45 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 13:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1279972086

Comment:
@lemmi can you help with the openimageio update ? 

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (4 preceding siblings ...)
  2022-10-16 13:38 ` motorto
@ 2022-10-16 13:43 ` lemmi
  2022-10-16 15:37 ` Johnnynator
                   ` (44 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: lemmi @ 2022-10-16 13:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1279973051

Comment:
Just this week I also tried to update `opencolorio` and `openimageio`.. but oh boy... I gave up. After that I had a quick look at what the arch guys were doing and I was kind of close with my approach, so I was kind of on the right track. I'd start looking there.

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (5 preceding siblings ...)
  2022-10-16 13:43 ` lemmi
@ 2022-10-16 15:37 ` Johnnynator
  2022-10-16 15:37 ` Johnnynator
                   ` (43 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2022-10-16 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1279993873

Comment:
You should find most needed bits an pieces in my branch here: https://github.com/Johnnynator/void-packages/tree/updates
Only thing I didn't fix was gmic-krita

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (6 preceding siblings ...)
  2022-10-16 15:37 ` Johnnynator
@ 2022-10-16 15:37 ` Johnnynator
  2022-10-16 19:51 ` [PR PATCH] [Updated] " motorto
                   ` (42 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2022-10-16 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1279993873

Comment:
You should find most needed bits an pieces in my branch here: https://github.com/Johnnynator/void-packages/tree/updates
Only thing I didn't fix was gmic-krita, but the update can probably just be skipped for now.

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (7 preceding siblings ...)
  2022-10-16 15:37 ` Johnnynator
@ 2022-10-16 19:51 ` motorto
  2022-10-16 20:19 ` motorto
                   ` (41 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 19:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


TODO (Need to be updated or patched in order to work with imath)
- gmic [ ]
- openimageio [ ]

This just need a revbump but depend on the packages above being updated ...

- PrusaSlicer
- blender
- darktable

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60226 bytes --]

From 488281c108b8d4c19fe18df660c2d0d38bc4349d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8194333576fb..ab897a694d1f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3881,7 +3881,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..97379d60492c 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 680b07b2ebd5cd00131461dc2449856df45ee429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index ab897a694d1f..2cb72c02bc49 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4185,3 +4184,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..8b782608ac1b
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From ed816ede991c1fdad079ff766919c72827d94433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 2cb72c02bc49..0a00eb48e55d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 07ac8259a3e3cc08632d8b21665f2767490c54ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 0a00eb48e55d..60a90903b6c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4181,3 +4179,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 41f395d06b5d3dd3e942d7f0bf8bb95df55b55e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f8e889d97f2a3e10f533c200e7ea95f1da450321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 528dbe9e6e73c9aea24e8eca39c048a9eb39edff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 41dc4b221255e7a0457625cc29f84fff7cc90c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From ab946681a1bfc9b3237d56dec699f45ae1ce83dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 0dce7c6374c5bbd4e77e7dd97cb38f6ab2665ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 7612f48c1a893bd025921364a356f68bdb17c541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From a612d8a588548bd3cafbae3667ee71023cd51b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 42e2315faa7688cc68cb1d9ad5c1444dfbe9c33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 02dd5e335d6e0023b54c06cab4c5cee96e17ae78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 957a680fdbb4d5fde978a774f7d905d04819f55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe6bb0f48ddb2f05db0dc001b93a12b0114e6420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 929ec1165148adab776c2140ca01438c0afdfda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9b852accd9c8419988a6812f0a97a4e84fd56740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 0719d6eadcc84c3f89f4de9ca4fa1a45eacdd435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From ebd9e06e86965eca6aff5e9eff498717eab1daec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 20 ++++++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 60a90903b6c2..caf2c1fca68c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..2a9c41c92f5f
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..879a27d78c93
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,20 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching the interface and behavior of python string methods with std::string"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From f93834eab8ed57509b6edb975380fe133f45325d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 20 ++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index caf2c1fca68c..2c8755c19d97 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..edf4c90c88e8 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 5a7aa3e9e985dff144187ee4e9217f39754faef1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 16 +--
 4 files changed, 21 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..a20235a64690 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,26 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
 
 post_install() {
 	vlicense LICENSE

From ba9109d9ba72204a4f565a3e71a10d274743fdce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 2c8755c19d97..b0fb2b0850a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From c9cf032fc2d79480d02af90d1acf549732a0b154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..df7f639572ce
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,11 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005

From bce1a3b5996aaded344547768a642776ebf75e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 760124c6f0b292f141416d5105247c35616da7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From f00a95c53f6b5d8b31f6616d9c8301e581cc563e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (8 preceding siblings ...)
  2022-10-16 19:51 ` [PR PATCH] [Updated] " motorto
@ 2022-10-16 20:19 ` motorto
  2022-10-16 20:38 ` motorto
                   ` (40 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 20:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


TODO (Need to be updated or patched in order to work with imath)
- gmic [ ]
- openimageio [ ]

This just need a revbump but depend on the packages above being updated ...

- PrusaSlicer
- blender
- darktable

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 61356 bytes --]

From f963c5993edb295ef726ec615133e1955daaebff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0aa715b7735dc05f841c307f38e4f004003f9e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..8b782608ac1b
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From fea4538416184045aae4f08fbe7b1e00232b3656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 7f299e1ded2974432c6b95987d69eea8fa4e40da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From aa7ab2b5bcd01ea1831f32c9149270f1f2592735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From c8737297962ac36db8f83c54da6ffa9e932d3862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From d21523421770e9a28925434053064e883dce2351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From e65ea5f9f3f6936a12f60524a89949557adfa44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 7692e3aade0f36e11e5299d915e1f2e3f91af385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 4907fabe8a779578fa2b2269092c255152c8d2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From bf5810723b0d3e71423c34c25aef724c69a80987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 3f5dc154a734cb71c48e5072ed282b9f772d55fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From ce1da9c9ad29e8e96652ddc9749ab600d6e6b6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 15635b6c433c1cec98349bd9e1ecec8b48c3ed36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From a3847e6f91f5c770c852b147c341db0a6d247d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a32f3cb387d7af9bc17a1ea2d22474afb1d5a850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From add21934a9a335b852fe88edfed6d066dc98b9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9725d75bb0593f89a989160c095b6727f0913ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 737ccb1953704f1d46aaf52ff742f715f855c727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From c58d99e4e272ff28874ea059c45abfc9736fbfb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..a6edb38147a3
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,21 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching the interface and behavior of python string methods with std::string"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From c6f7ce361a93cb435cedc8a536c3549071b79830 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 20 ++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..edf4c90c88e8 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 3ca33574e711564d95e4c7e83009b41c5d6b32f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 srcpkgs/opencolorio/patches/cross.patch       | 16 +++
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 17 ++--
 5 files changed, 38 insertions(+), 137 deletions(-)
 create mode 100644 srcpkgs/opencolorio/patches/cross.patch
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/cross.patch b/srcpkgs/opencolorio/patches/cross.patch
new file mode 100644
index 000000000000..335b40fd46ad
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/cross.patch
@@ -0,0 +1,16 @@
+diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
+index a20235a646..50a1495641 100644
+--- a/srcpkgs/opencolorio/template
++++ b/srcpkgs/opencolorio/template
+@@ -5,7 +5,9 @@ revision=1
+ wrksrc="OpenColorIO-${version}"
+ build_style=cmake
+ configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+- -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE"
++ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
++ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
++ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
+ case "$XBPS_TARGET_MACHINE" in
+ 	i686*|x86_64*) ;;
+ 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
+
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..f3ac50080faa 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,27 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 4ae9add06b9c99f5b073bdd4bed04c43d5e2cff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 65d6220db0f1cc7cea4199ffce2442a6f8f7d695 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..df7f639572ce
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,11 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005

From d40bfe19ca397e26e30e61bd836889cad0fd8453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From b7c3bc2af0dbee59a12309f66cccf16ef7b38c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 5496a867cb24b8b1159dfb17cd9c77f9df519329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (9 preceding siblings ...)
  2022-10-16 20:19 ` motorto
@ 2022-10-16 20:38 ` motorto
  2022-10-16 21:05 ` motorto
                   ` (39 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 20:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}


TODO (Need to be updated or patched in order to work with imath)
- gmic [ ]
- openimageio [ ]

This just need a revbump but depend on the packages above being updated ...

- PrusaSlicer
- blender
- darktable

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60456 bytes --]

From f963c5993edb295ef726ec615133e1955daaebff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0aa715b7735dc05f841c307f38e4f004003f9e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..8b782608ac1b
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From fea4538416184045aae4f08fbe7b1e00232b3656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 7f299e1ded2974432c6b95987d69eea8fa4e40da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From aa7ab2b5bcd01ea1831f32c9149270f1f2592735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From c8737297962ac36db8f83c54da6ffa9e932d3862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From d21523421770e9a28925434053064e883dce2351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From e65ea5f9f3f6936a12f60524a89949557adfa44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 7692e3aade0f36e11e5299d915e1f2e3f91af385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 4907fabe8a779578fa2b2269092c255152c8d2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From bf5810723b0d3e71423c34c25aef724c69a80987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 3f5dc154a734cb71c48e5072ed282b9f772d55fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From ce1da9c9ad29e8e96652ddc9749ab600d6e6b6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 15635b6c433c1cec98349bd9e1ecec8b48c3ed36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From a3847e6f91f5c770c852b147c341db0a6d247d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a32f3cb387d7af9bc17a1ea2d22474afb1d5a850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From add21934a9a335b852fe88edfed6d066dc98b9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9725d75bb0593f89a989160c095b6727f0913ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 737ccb1953704f1d46aaf52ff742f715f855c727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From c58d99e4e272ff28874ea059c45abfc9736fbfb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..a6edb38147a3
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,21 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching the interface and behavior of python string methods with std::string"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 279934c9d6dc02a25b3fb57c88605d026c662bb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 290248f646c40dce9c22483c943c10e99748b7a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 1e96e28f34385b9ad58c1208f2d1cfe32ff74728 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 43c56a19dac04f661fcf7692545d653dbcc1f609 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..df7f639572ce
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,11 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005

From d4397fbf0e6182ca192d63d43f7bc66aff4338b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 3213ea0cfaec549d81e370a328c53cb69a798d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 8f611fbb1ff9a75ad2949e889a364e67835c3faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (10 preceding siblings ...)
  2022-10-16 20:38 ` motorto
@ 2022-10-16 21:05 ` motorto
  2022-10-16 21:06 ` motorto
                   ` (38 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 21:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

TODO:

Missing cross on imath-python3

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60470 bytes --]

From f963c5993edb295ef726ec615133e1955daaebff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 79189f7247d3d9f8e2dceb3c14d939d7e3f6c781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 305edc1a696371489639722a77666284b27b65de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 3ac542f3b2ed2dad5a7c8e78c0272769940bf9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d92479141ac6b6765a955219e59a66736dcc4139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 568292ee2912a640ed37a04c483dd49c306f2204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 267abf457894682b448b728379dcc77eaffbadc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 15f7ab70991eb98fb2dc6022e831cf1de3928250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 2287fb83561c8a63590e037a5e56db4326008b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 1d715d6fc6e495ed0a901aa622eb81ea928221fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 72aafa450cc3af5d5f2d6ded25e24b57caf5add8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 5f2171b76318e09ecfa489f5eb6c9633224a5f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From dc93a315fdec7841cec990a4f98c89e0a0b4f838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 42cf20bb3658fe6d2de329c777e975c49d480b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 012dc5ef9538d0e9199669ef07d743a80aec76df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9779ed541659ae215cf8017ae365c17fe7a7ffa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 682a2e9d5dadb579f258e40a0db485c27ccdcd41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From b51d99bf88c196e0282ec168a9567f5d2dfdc669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 557d419996b363f87343f6fefe8df2aa735608f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 6fbad0bab6190867de593e39457b6e2b2fd75da2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..a6edb38147a3
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,21 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching the interface and behavior of python string methods with std::string"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 4d72c845b8c13c6b9c9a5dace95f9e8331f96b8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 78651df788c4047592c17dfc138cbd5a758daa56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 1dce160be5272929a6cc1e3f4bcb08384f5fc834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From d70557d76fd6f43bc8aaf373de07aca00271ea1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..df7f639572ce
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,11 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005

From 21ada9691bdaf0edbf68785eebeb633389223c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From f4f9f3c08b70f60911e4cbac89fb9c50ce92b0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 12c9fd82cac151ff0177a074da49239a79d4787d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (11 preceding siblings ...)
  2022-10-16 21:05 ` motorto
@ 2022-10-16 21:06 ` motorto
  2022-10-16 21:15 ` motorto
                   ` (37 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 21:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60470 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 754c54db5b62600a28d5e7bdf31e39b3bf19402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 570d478b80f7bd33d628c9ad11607f975dd52563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From bb1fddafb6c17b883db8d164ce38968433b09fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 82ed007e45d640a16a4d4556023efd0a2d47062b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3cf2ccf39b8d436872540484bb9d95a10fda8213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From babc591205bda76012683a2ce0d7f3508cb58360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 12a06a6cd5bc2476dc39ee279b4aca898de3c8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 9c1323e7e10795729fdb662a13f23b66c16962d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From cc92e84f206e3b468c26e65449184e581833f5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 78b1c99c3a0e87f6a09487f4250ef9cc7b0619cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From bfc84d4c60a8ae45a3864bb3b27b1a86d4fdfc91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From c23d97689ec0974317f375b821ebcf6e9637052b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From ef17edfa10e02b5f8f1af4078940eebfbcdfaed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 912f49b21e892f70f928090d46ac7061e225a50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From afec019320b632f9cfe62e33173d1a9cb43987e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 877fe2be007ea9842acdf1a2b703e2a0954c399d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 3c6a9585fa34f3483fba613784ad1683f4f9cea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From c6ee920855ae9357cf9a71d2957f6bf833da55c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 1ecaf9d26d6bf4135b276f756d8fba0b1b037d94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..a6edb38147a3
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,21 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching the interface and behavior of python string methods with std::string"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From aab8431c96ce69b74285fdd249f258bf0df3daf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From b20d6dd8f0cef21634b43186916b8ea49db60636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 145f208fd69cdb4c4edc38f256cba7c1ef979038 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 7a34c15d2ecd1e9c02dd1877e08ff840416d3167 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..df7f639572ce
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,11 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005

From 98bc6f5f249317830666f451e30b4cf3fe500f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 902ec5315a35bbdfa460b8000238d21f05cc9181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From baae71d7ea7b51cc9ca5249238be0bd8a1933265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (12 preceding siblings ...)
  2022-10-16 21:06 ` motorto
@ 2022-10-16 21:15 ` motorto
  2022-10-16 22:16 ` motorto
                   ` (36 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 21:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60530 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 754c54db5b62600a28d5e7bdf31e39b3bf19402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 570d478b80f7bd33d628c9ad11607f975dd52563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From bb1fddafb6c17b883db8d164ce38968433b09fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -------------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 -------------
 srcpkgs/openexr/template                      | 20 ++++++------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3b02be747cd6 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,17 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -23,16 +24,7 @@ pre_configure() {
 }
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 82ed007e45d640a16a4d4556023efd0a2d47062b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3cf2ccf39b8d436872540484bb9d95a10fda8213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From babc591205bda76012683a2ce0d7f3508cb58360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 12a06a6cd5bc2476dc39ee279b4aca898de3c8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 9c1323e7e10795729fdb662a13f23b66c16962d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From cc92e84f206e3b468c26e65449184e581833f5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 78b1c99c3a0e87f6a09487f4250ef9cc7b0619cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From bfc84d4c60a8ae45a3864bb3b27b1a86d4fdfc91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From c23d97689ec0974317f375b821ebcf6e9637052b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From ef17edfa10e02b5f8f1af4078940eebfbcdfaed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 912f49b21e892f70f928090d46ac7061e225a50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From afec019320b632f9cfe62e33173d1a9cb43987e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 877fe2be007ea9842acdf1a2b703e2a0954c399d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 3c6a9585fa34f3483fba613784ad1683f4f9cea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From c6ee920855ae9357cf9a71d2957f6bf833da55c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 0bee1264e15c456d9da669c602f7cb234ccd5493 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 39704f6dbe9d395fa0cd6cbd1f37b32b88ebc623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From abbe97f9eb2b9cc40144d1bfbde14fe8e03a9d84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 41122233dd3c9868384f322ef04fbd8394b24ec1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From aef01df54f1799d7c26877033119fff3b2a42752 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From a140b3bef08d6e287a24f75584e4271fe211359e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From c47112856fb5d687c92207f6c1593f0f340307f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 756a18a3ec075cef01ed8f9c4af12dd7ab2a3833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (13 preceding siblings ...)
  2022-10-16 21:15 ` motorto
@ 2022-10-16 22:16 ` motorto
  2022-10-17  8:42 ` motorto
                   ` (35 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-16 22:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 60678 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 754c54db5b62600a28d5e7bdf31e39b3bf19402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 570d478b80f7bd33d628c9ad11607f975dd52563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 6f46130685790b532c356217f79bb26c570a0bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From affba8c2470f35c753d9d0006fce2b9509780069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a669c1e5af7ba38fae2a1e6c76d6b5fe69a64835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 0a940ae46b14f94ca8b91928705d5d65f2166517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 0989d201a7c736f5b5cc1669b51eef82b216e810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool

From 0c8fc037b71f9c033c5c3d4f87bdcd4f137e4845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 182f296bcba97c2058516b1ad17f3354079be475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From b8b2c8198c179981c69a337f0ca82044e183aace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From bb56c785c5e29c2733731924cad7255883eaaaee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 1280236fb18e66a1b938ea12e1e6c3fd16d2251f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From c23e57e28ce2e245d56c6aaf2aff24eac948c71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 98482b4ab66f713aad6763dd55a839854243c9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8aab22a0ddb59f55d357d6a38ac76aaaf875bbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 09660e4d3169af9f0835bd10cbb95131e1f7d8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 06679bb7e809bd9c5fa76e5f9ea08eafe4b5df66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 17758be840dc9c522ab95d9fc376f79811e2b0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From d8c1008588eba96972869a6f794651c96956172a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From bda48e9bc025cd8c9dde4045f6ee4faebfec551e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 62c1a0d1f1d2344b3c6b28d2cf98faa56f0c63cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From c14e970569bf56392db87c1498f5e6b5811ef343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 70039d776f19c91afddd00130aa3c00891b6d1a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 6f2b83a65279bfd410a792eb22d48b22f8058e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ceecadb4eab4031562508aeb128c9f3b601d2f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From d8a3fc08a27fb32384540a0b5cab99f4a31c415d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (14 preceding siblings ...)
  2022-10-16 22:16 ` motorto
@ 2022-10-17  8:42 ` motorto
  2022-10-17 12:40 ` motorto
                   ` (34 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-17  8:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 61376 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 754c54db5b62600a28d5e7bdf31e39b3bf19402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 570d478b80f7bd33d628c9ad11607f975dd52563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 6f46130685790b532c356217f79bb26c570a0bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From affba8c2470f35c753d9d0006fce2b9509780069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a669c1e5af7ba38fae2a1e6c76d6b5fe69a64835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 0a940ae46b14f94ca8b91928705d5d65f2166517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From ec471fda4b11a34151ed950dce37a7bb5862ec2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..49ab369dbfe0 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 8e69d39ba94a650e4faf1debe09f66483ebb12b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 2dd8ba7e65469905baa33eb2dbc68bd26097de13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From d9a52628bf025cf6789eb3f223f979bd3d0b7a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 7b145dfb38790a09f9a4cfc68f983bddadd88a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 19821805c5e880e39ea2d913d9f068d58b7be8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 302ad8f0a153fc7836af6423097b2ebc09f69e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 96e92630d3c4a326dff018dc8e88d1eca4038392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 20036e98c5bc5662321dcd9f20aaee77d4b80c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 22d4ea3fb55d4a9ae85e2f31377e7851517214cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From e6b51e71f60531c43633a8f99507f9a2d0144477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 8394683acd1225a98d42c67c3459489bb6b04e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From e7f6c7a02fe17dae4cd261befa27d7c7e80938e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 7eb8a9f653af57351e8519d430390e169ba1fcd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 ++
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..80fa84f71586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,8 @@ libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.1_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From aca18fc20ab94e3dee5b1981fbb5a95762c90222 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 8688d969f000a95c0ba877dcf970b404891e9d1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 80fa84f71586..cbafedbe2349 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 49ab369dbfe0..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 39568d631f1979eb28ae011a5a7d2916558c1738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 97bc5f86b9bae694e4604a2e4f33502b18258f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 8cd1981b02f4dcdbc2ec9253c515fff143c3b153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 41d0fdfa050952ec0cb6311e5fec83a1a716e4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (15 preceding siblings ...)
  2022-10-17  8:42 ` motorto
@ 2022-10-17 12:40 ` motorto
  2022-10-17 21:49 ` motorto
                   ` (33 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-17 12:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 61351 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 754c54db5b62600a28d5e7bdf31e39b3bf19402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..a6fdbd2dec96
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="python3-devel python3-numpy boost-devel"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 570d478b80f7bd33d628c9ad11607f975dd52563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:40:02 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 6f46130685790b532c356217f79bb26c570a0bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 04/27] openexr: update to 3.1.5.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..71c593f4f54b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4182,3 +4180,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From affba8c2470f35c753d9d0006fce2b9509780069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 05/27] Field3D: revbump for ilmbase removal

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a669c1e5af7ba38fae2a1e6c76d6b5fe69a64835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 06/27] osg: revbump for removal of ilmbase

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 0a940ae46b14f94ca8b91928705d5d65f2166517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 07/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From ec471fda4b11a34151ed950dce37a7bb5862ec2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 08/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..49ab369dbfe0 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 8e69d39ba94a650e4faf1debe09f66483ebb12b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 09/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 2dd8ba7e65469905baa33eb2dbc68bd26097de13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 10/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From d9a52628bf025cf6789eb3f223f979bd3d0b7a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 11/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 7b145dfb38790a09f9a4cfc68f983bddadd88a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 12/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 19821805c5e880e39ea2d913d9f068d58b7be8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 13/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 302ad8f0a153fc7836af6423097b2ebc09f69e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 14/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 96e92630d3c4a326dff018dc8e88d1eca4038392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 15/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 20036e98c5bc5662321dcd9f20aaee77d4b80c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 16/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 22d4ea3fb55d4a9ae85e2f31377e7851517214cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 17/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From e6b51e71f60531c43633a8f99507f9a2d0144477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 18/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 8394683acd1225a98d42c67c3459489bb6b04e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 19/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From e7f6c7a02fe17dae4cd261befa27d7c7e80938e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 20/27] New package: pystring-1.1.3

---
 common/shlibs                        |  4 ++++
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 71c593f4f54b..8f15a3ca3c47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2221,6 +2221,10 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From d4c96333f68f8e9d548595770dabd6c6f048b260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 21/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  2 --
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f15a3ca3c47..ab32c49f7cdd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,6 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
 libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From d0c8511f4375d4d2730df5a5ac8bc074536cb3b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 22/27] opencolorio: update to 2.1.2.

---
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 4 files changed, 24 insertions(+), 137 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 35acf27bddf0e81629e534d8808e0e2f0c8e543c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 23/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index ab32c49f7cdd..d7d1a920b904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 49ab369dbfe0..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 7cf5e730dd1f6c36df1352f13c82f974ee34a658 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 24/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From a068085ac1eee3345ee0ebb6e5dc8bbb587976a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 9040ce868ea7047d4dc61bc6055177ba125b43ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 0a5dc59c788afa3ef4cfe355d64f55463fc52a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (16 preceding siblings ...)
  2022-10-17 12:40 ` motorto
@ 2022-10-17 21:49 ` motorto
  2022-10-17 21:58 ` motorto
                   ` (32 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-17 21:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 61834 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 12097d81c3b54babbb5aa3a5c61f11d008af53a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..3b3660b3c799
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 5f23b08aac3f58a3151c5cfacf3c6835a025abcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 311c74d1648d094d34e1c4aa7cb268a357f85e72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 1cf5e409861c9910806a2280f94a2f48e7f5fbec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..b6da1d312489 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From e6793fb8d82ce8570a20883c49eea51dfb47e66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index b6da1d312489..25c831d56889 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4183,3 +4181,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d97c44712a81eaf53ba866ed5fe0eafd19e197c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 25c831d56889..42139e1c3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From cb828106032c0afc75b4b0b304f4ce29b48f1320 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 19 ++--
 5 files changed, 25 insertions(+), 138 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 42139e1c3104..5caa22854174 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2220,7 +2220,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..9eb6c30d5c33 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 70512a00117a6c3369bac06888d0fb1160874188 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5caa22854174..ffedf6268bc9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From efb5b893fe4289d84dd2a6c36a4e35892312485b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From b5467d04796afd3bc85d0becc9baa6a3a3b3d63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9b80c81617ce 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"

From 360a33942dbfaad27b75140f0e56ebc86bfde5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From e5c4aeb2bcb5513cf088c0a1dfeeeef7cebb01f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From a2d5b6a0244fc0b693d87c92a12685b9152c8d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 07bb46b14d14ff5326f9c90386e949c240a0cc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 56a0399a4d040796386c1af9a513aef83fb4cfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 754f21a3d72e7096631ec75f98b6276df9096963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 96a07c2df2be35ae7d0fb89775c9b11fa9fffd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 6e9fcf40bc6cb4bf579833df601ba786dad34564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 7516c21fb62e676740766e87f06595aa3ffd86e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 778e4df53be8b1c326b73b75f4c943ecc16c72a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 94260ab17cda23dcb93103aee004b60efd72eea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From ca031ec0fd2662b5a604183d6b47b52139369895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 0bf96cbc10ebcced774a46ace12cb9f459e4bc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From ea8fbde3e4e9635fbe7be386ee6f482cf299d091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 66a371868dea6dfd3e51505cfee3f8ad7e0a8521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 46d0fd5dc3f9c36227fdfe8949a39a98a2da9240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (17 preceding siblings ...)
  2022-10-17 21:49 ` motorto
@ 2022-10-17 21:58 ` motorto
  2022-10-17 22:01 ` motorto
                   ` (31 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-17 21:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62432 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 12097d81c3b54babbb5aa3a5c61f11d008af53a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..3b3660b3c799
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 5f23b08aac3f58a3151c5cfacf3c6835a025abcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 311c74d1648d094d34e1c4aa7cb268a357f85e72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 1cf5e409861c9910806a2280f94a2f48e7f5fbec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..b6da1d312489 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From e6793fb8d82ce8570a20883c49eea51dfb47e66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index b6da1d312489..25c831d56889 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4183,3 +4181,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d97c44712a81eaf53ba866ed5fe0eafd19e197c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 25c831d56889..42139e1c3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 288f6e2a14fa608a4c19092fc1da9c7eae4e93ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 21 ++--
 5 files changed, 26 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 42139e1c3104..5caa22854174 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2220,7 +2220,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..3416953efe10 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
 short_desc="A complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 5bab68e51797ed945858cf80fdd9cd1168a7dc0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5caa22854174..ffedf6268bc9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 5136182277fea6e1c9f97569d564cf2b8acbb40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1dc931064e058b37cb0495bd4151a813c848347f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 7cc83069a778caacb4854a99db6df7e37a4a8dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 02e02d4ab4c458185f99a96dda64c0ec3db3295c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 7f9cb840c4c3f7835052dc238ee67fa4995aeb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 64ed6c1217cfaf94405ffdfb9226567a93b72012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 52036d56113f64ec930aaa914e536c10a517f2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From dec4aafa7f88f6f0b16334f5028590a7c3c6dba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 8f99f8056b09564f201e8c13c4cfa2ab2d9b90e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From e43bcc6e126ca220940344e914b3e462af889ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 3b8588f5a1dd196debdecd00c78ad461309fe9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4aa06f6036775565d80137254f3251ef34137421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 2f2db94d6d6e5f19ab2ac62abe54dcce64e7a2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From ccd558e79b304375b7898a18772b6dd3d147f54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 5847d0d04c47f223c311723f3202dc28411c5243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From dc7103e5a64b9bc59a48679b763ee9b7385afb68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 2f22e6f83b19197d3f9f9542d78f077c1f4f5175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 09bfd6d05055904cf72bcd65fb117441d7c8e65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (18 preceding siblings ...)
  2022-10-17 21:58 ` motorto
@ 2022-10-17 22:01 ` motorto
  2022-10-18 14:40 ` motorto
                   ` (30 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-17 22:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62482 bytes --]

From cda1f0f4a253f7024860d81dc1ca8c402d04509e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 02780902e137..37d8cf595a78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 12097d81c3b54babbb5aa3a5c61f11d008af53a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 37d8cf595a78..a476d8204d3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..3b3660b3c799
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,40 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 5f23b08aac3f58a3151c5cfacf3c6835a025abcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a476d8204d3c..c6deacc225f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 311c74d1648d094d34e1c4aa7cb268a357f85e72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 1cf5e409861c9910806a2280f94a2f48e7f5fbec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index c6deacc225f6..b6da1d312489 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From e6793fb8d82ce8570a20883c49eea51dfb47e66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index b6da1d312489..25c831d56889 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4183,3 +4181,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d97c44712a81eaf53ba866ed5fe0eafd19e197c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 25c831d56889..42139e1c3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From cc34791c7f43205e53c468ae786edad411e276ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 23 +++--
 5 files changed, 27 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 42139e1c3104..5caa22854174 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2220,7 +2220,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..596cc2d76757 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 3ad53e2627b8af8d86e8b29d97f8e6a7f2fdcf2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5caa22854174..ffedf6268bc9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 90c6e9c99d8ceeb097cf2d7ddedf4a9f60090311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3aa475cd85af9056a56009d5dc1d8e36a21719a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 26d1d5d0eef00e747515854fa9480dfb3b7b41cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 8397c50b6dd0617f03fa052a9d5e342e03ba5a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 8b3c6d83f502735e7450a3039f5cacca29a4824b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From ab2288a01fc8be5eb9c8dacbf6ab8417bc9bdf4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 7848422d4e818c9c0f19bcb0a6657642b821e4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From ad6964997466cee0d76514d378fe09463643a2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 4144bf3e383d8f2072c6fdc7ffdc3a935b422c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 3ac2f4ab7535c6636dc1e464b0a38e4258642d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From c37e95a38c4197d513ee8bd04decad6a7052ece4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e61eae89b01b8ae0d88a83ad0ff5bde583975247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 358176bac7266744f0a688cdcf4d68258a7e9809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 181fe35c9e2197f025e4bcb4afa64bf74327071e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From f9316d1afddaeb2d3700c446536dc99f12a48016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 1f8d9bc6d34d8030bdd3a5197d2cb7c96573e605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 91c7f9625d13f7dbde03c9e33b8eef2fa3322681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From fe2e326a834f8729b7c0a347717b4621d360d200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (19 preceding siblings ...)
  2022-10-17 22:01 ` motorto
@ 2022-10-18 14:40 ` motorto
  2022-10-18 14:44 ` motorto
                   ` (29 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-18 14:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62646 bytes --]

From ee45798499898bbdcf06b967e79bd48278bcbece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ecab4d8f7ecc..0aff11391b88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3882,7 +3882,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From f7f5b3acb5710efa128139313af662d22a98700d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 0aff11391b88..7200763bf772 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1686,7 +1686,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4186,3 +4185,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 672ec21e2f506906036986e81c560c8c6bc4ff2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 7200763bf772..fb17fa80412b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,10 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 7b953732bb2cc212fef287f117e9a7d77abdaee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From c66b9ff49de4dae7eb8d67d1337346a9147bbdb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index fb17fa80412b..1972d4da8b7c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2223,6 +2223,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 0a75033b7e9f04d4a53e97693966d5cefb3b50b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 +++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 --------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 ----------
 srcpkgs/openexr/template                      | 29 ++++---------------
 4 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 1972d4da8b7c..310c0c364bfc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1683,8 +1683,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4183,3 +4181,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..7456e23df544 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,21 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d647bc39019c17c476ea2dfbde3b21f2716c70c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 310c0c364bfc..7a3393199b1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -550,8 +550,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From fe55ea5aaa94095729d5395e48f8c54ea7343141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 23 +++--
 5 files changed, 27 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 7a3393199b1a..acebf103d1bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2220,7 +2220,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..596cc2d76757 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From b45aac983ae5b66a86dadbbf5c58e8fac5cf0e69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index acebf103d1bc..46397194f911 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 0ae1bd1d27ae57b41031c50031bfc197bd0671b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 8b3f8ed61dc8615368c8e5f629c5b63e80f5ac59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 29a92138629c2c1957157a3599034a38aab24198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 65180c67f2c38848d1a638396bff09ea161486df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 6bbf5c93ec6636e0ecdfea4ac123f74547ddc5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 57544b382c245ca10d60794257aaf51f96c962ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From b7452686c82acd0b482e4057e76e79da600189e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 264483e76823b07e2f4b74ff0b02452292166602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From b3410273d0916fa5bc33eb6dd59a4a5f28b096de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 3da1fd74758f33c5718b9fbd9de9faeed068449d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 0725b68ef251f6ef3a80d94a28c0836dc9dfdb54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9c53ac537386e3b89a08bd54b9e1f9fdfb400f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 42d9eadb5616fa402f217ac23a870914765cfa01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From a290d5be30776c5df47c562f56c742b032f2ddd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 24f57b65f2382baca0ccab1dee9eb4f624c94ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 95635f011bc08a57b993f9128311dcb2ad7f7ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From fede7ddb3d0cd65fec10ff34509fb541220d474f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From aa9071db4cd0acbaa47994274ca6ac52f7b539e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (20 preceding siblings ...)
  2022-10-18 14:40 ` motorto
@ 2022-10-18 14:44 ` motorto
  2022-10-23 11:45 ` [PR PATCH] [Updated] " motorto
                   ` (28 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-18 14:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1282511771

Comment:
Tests are failling on packages that I simply revbumped 

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (21 preceding siblings ...)
  2022-10-18 14:44 ` motorto
@ 2022-10-23 11:45 ` motorto
  2022-10-24 13:34 ` motorto
                   ` (27 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-23 11:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62875 bytes --]

From bf70cab7fd35fd8466506d2b4852255e052ce3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 17263fadc71a..b6919de9b8d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3888,7 +3888,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 7cae1d1a105a190ed5eaf42dea666b4dcdf7f38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index b6919de9b8d3..82bd0863e87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1692,7 +1692,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4192,3 +4191,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 9ce77f286921a6d6ca5c2d0514bcaac7edcf281c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 82bd0863e87c..06ce5ef507cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,10 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From c8c0e3f156ac049625f9163675e2b67d1fe885f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 2d4123307a42ee04a8d214425de5606fdcb7e1e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 06ce5ef507cd..98ed27185213 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2229,6 +2229,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 127af1f639a68615e5a6575d0a884d3f04f653fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -----------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 35 +++++++------------
 4 files changed, 18 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 98ed27185213..e32991100e77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,8 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4189,3 +4187,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..008dc9a5dcd5 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,29 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$xbps_machine" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From f74e7eb1b069425dd9db7bf9b8cd735f022fbbf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index e32991100e77..885faf188c55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -554,8 +554,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 2ac9917be8372c3770fbfde7c11fe8393e1df1fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 23 +++--
 5 files changed, 27 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 885faf188c55..6fb088bdde57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..596cc2d76757 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 6afd259211d612226991406fbdc4154de6f420d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6fb088bdde57..4f90ddaab330 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From c1e83d5d46a528df1067422889697789109fe1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3876f818d48402e62edf354091fef6be6bfb1d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 5d3c1c46400aafa57170696a0efea5bb4b37d8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 88c420c1345696e25218d396981ad07650e42b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 12c51cc05f7bb8101a34f45a4919a9c8c6c3f26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From a591af34673d6c92ad75b6376fc2d855bd09f1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From e7985b918ce49cce4342ad28d6497a60b93dc603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 5bab969d3732f18ef3ec37a2532737816fa96741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 138efb35479bc3682eba3d429abcd093b96fc32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 74ab9cd3cb0ce577b64319d23a8daca2a8471f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 0da6ab19f34497b81b0e68593deeccf89479b36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 91a744887a7ceeba6cdb825fe809b388b1652f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 0dad2a3c1d881b4c4b43cc19084af63bedb737b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From c2e10a31553041365722cd921736d0b14fd71317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 4ff517302fcb361e86f73b4c795b04ac4e25d074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From dc812f6f534597d3dc40a41e91e0adc0110e264f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 83495cd7fee489318e649ff3cf02593f76b7d1d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 45f5df803b5021daaaf5af17b26915566fe36a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (22 preceding siblings ...)
  2022-10-23 11:45 ` [PR PATCH] [Updated] " motorto
@ 2022-10-24 13:34 ` motorto
  2022-10-26  8:45 ` motorto
                   ` (26 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-24 13:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62875 bytes --]

From ef797e538f06491213dbe0e291604ed70823cd36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 17263fadc71a..b6919de9b8d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3888,7 +3888,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From ae8b14ffb4546e2d7cd0367a01a635c0c63ff194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index b6919de9b8d3..82bd0863e87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1692,7 +1692,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4192,3 +4191,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 148c6b21edc22a41669219c413736e498d79bb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 82bd0863e87c..06ce5ef507cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,10 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 89330226cc8653d2e31bd5ab2b2473a723749dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 9ff70fd37b25a32874c67337d11272f02240846b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 06ce5ef507cd..98ed27185213 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2229,6 +2229,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 8cda4a314bab8efe59b842dc1858284b36387712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 -----------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 35 +++++++------------
 4 files changed, 18 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 98ed27185213..e32991100e77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,8 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4189,3 +4187,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..008dc9a5dcd5 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,29 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$xbps_machine" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 9da2d5dccab00579e87d5a0ba1dce027a49a4654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index e32991100e77..885faf188c55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -554,8 +554,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 4745416614bafaad0f211c394c08e514254258a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 23 +++--
 5 files changed, 27 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 885faf188c55..6fb088bdde57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..596cc2d76757 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From b60cc795494f64afca8fc0fa5716b034b761f21f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6fb088bdde57..4f90ddaab330 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From ad8d4d00f43453a9eb20433979b1345fa98a3d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 9454dc703760536b1195d3d7a1f39edd3fca14d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From a69f2c29fd417e36c42c330607833eadd13c4a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From c43c1549e23f8873a9885d06bfb3e3192554a0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 80068d902e191ab7a69bc35993aeee79df9a34d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 41d174f5d5a1364dd2db0790fa667e67fd18ff79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 0ad4ce1ebcee2de7a0772b757a0263dce3b2ec7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 427f51928fa35b90e750c3942bb922a3d727b1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 2a0af4efda9531b5de2361d761db908c4ae57294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 4aa0939ee541e9058af0d3b0cb12c90aef202162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 5f51c15937043addae90a418cb5f64751162ebcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 357a2aa7e0c87f9b2e3a083b3f358e91b7b5bb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 9715b12bfdecb2f7df1e4184b15ecfba25065814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 65d5cf4fee6c7bdf7ad7e0e761063b9d3682a242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From eed166b40c2f4e753a826c83755e5cc77f1b270c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 1cd5f4b0de7b06f53f880ab07013c45861ce6922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a88197a8ee35cc2f1c4582f8c1656eeb7aa00f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From e87bae696efb4e1adcef85180060ffda230a12a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (23 preceding siblings ...)
  2022-10-24 13:34 ` motorto
@ 2022-10-26  8:45 ` motorto
  2022-11-02 11:21 ` motorto
                   ` (25 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-10-26  8:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 62813 bytes --]

From 1f5c2d0f3e1ac3c5e0c00a4ff9f1ce3ca730bef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 17263fadc71a..b6919de9b8d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3888,7 +3888,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 974bcbfa139867cf00813f453660c2fcb1e9a18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index b6919de9b8d3..82bd0863e87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1692,7 +1692,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4192,3 +4191,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From b3930388ecd88c5403587c8a6834ed5d1fa79736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 82bd0863e87c..06ce5ef507cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,10 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From e3231571b78a7387287625aa6a06b7f81c401944 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 99a01bc81c59af7139ce4a5a390385c86645ff07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 06ce5ef507cd..98ed27185213 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2229,6 +2229,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From d5efe3d9d42b5cfb39af9f572d353f968717942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 98ed27185213..e32991100e77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1689,8 +1689,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4189,3 +4187,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 01ba88bbe2dac6afdfa496cba0d6f386e474b647 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index e32991100e77..885faf188c55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -554,8 +554,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..b79d706c94b3 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -18,9 +18,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv ../zart-${_zart_hash} zart

From 6d703aaecad7fc9f3fd9385ae466502c9d7892db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 23 +++--
 5 files changed, 27 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 885faf188c55..6fb088bdde57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..596cc2d76757 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 02dd3a2c0488fb50e2cb5a9af18f6f35b491c986 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6fb088bdde57..4f90ddaab330 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From ee080e2bff2171bc616a77a2813923529f139629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 33b5db6003e988a897362d8bb83e1dfb994ec7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 65e14356b806433d7238e9d0a5139e582a1832dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 65b70cd1ed314a600ea43714432a508ac70e8d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index b79d706c94b3..8773667422f2 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -9,7 +9,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 768eb83c060e76c952bc7d5e1f3c49d95fa07617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:35:52 +0100
Subject: [PATCH 14/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index b15f96abe599..67e44a3074f5 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.49
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

From 5d65b1e8d3f7438fe97dca85f58d796b3d8f3d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 15/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 85003ca55886c15802e3c6c76faa59307bde33b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 16/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 42651a3563d73180e2f757d4d5ea3ca712f98cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 17/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 385cbe4597c0954f256e76094e143f546930f953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 374e9cdb73804a2ccc572a0740c86427a96faa56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 2e2d8d0b2b67f113fa8b1702751085468f650e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 20/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f273b732c5aaed048ce7f410bddbf41e686179ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 21/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 875201c5d964d71925bc6f60481acedeafa5f53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 22/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From d21b0ef3b2e4722244757eca12a8c825802e3f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 23/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..b00333e4b0ec 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"

From 4d78bc15fe8afc0ba5ca9de02457643d0ac9e751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 24/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 975b7bb3c14892255cb3880fb42680437987b1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 25/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From c82fc4661c5025a3737b87ee88f0cdff9749ed9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 26/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 53ce07f49b4f79806948cdfb241f966c6757e710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 27/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (24 preceding siblings ...)
  2022-10-26  8:45 ` motorto
@ 2022-11-02 11:21 ` motorto
  2022-11-02 11:26 ` motorto
                   ` (24 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-02 11:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 68743 bytes --]

From 2a63682974c8706d5dd7436c8826cf92dcfa17dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..e8bd2db0e8a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 48e52c37a0b6aa9fd2af84e3b63927f9f0228629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index e8bd2db0e8a6..402384fea5cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1698,7 +1698,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4196,3 +4195,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 863afd487aab55f71e45ef0f30e1a5db3949d6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 402384fea5cd..545fac8be581 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 7e97028f74668542feb00a9a3b1ae036c5b11c8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From ab775f6ab87e93bca4a41911b6cfbc8900ff4470 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 545fac8be581..b6334070ac38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 6abf58e26f56daeb87ed46748a3f953eaafdc8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index b6334070ac38..36b2cac01a7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4193,3 +4191,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From c07e8f330b590c0908f60720afea7555feb19710 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 36b2cac01a7d..c492fab0e6e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,8 +560,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 87cc42a54c6b6b2b244f1e887fa17ac123a8d7aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index c492fab0e6e4..9347dbd5935b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,7 +2232,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..c2f845512e37 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From bb9b4e7b873026fa7c3aa389ecf50e73386286b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9347dbd5935b..9364ef66a05d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2230,8 +2230,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 536ac54224ab1f4e61bad5e271ee73f6c136610f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 1a7c9f9b64c9b7eca29d10ea25e96c9719655003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 560af732e780145c224bfd685f1647a4982f50d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 50295589ec2a653d5326a24100ce0793477bed8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 5f08a435fba2272adfb12cc4f755d039767f6922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From eccacf32241e2a4da58a23316c37a757be6fd18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 15/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 1be242b4f1d46c38748aaa6b49c9c622a02c57e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:12 +0100
Subject: [PATCH 16/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 8af5fe7f53e7..4ae2d67244f1 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.98.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 284499e504ad73f86a4398ae0022aa6698d274cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 17/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 01a87a4c4eaaf257b8f29de74435a640b90fd4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 18/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From c2c616e2b5bc7a0600e2b27f5ae2144e4b29002b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 19/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From de8f4343a52cfaea753f9178012cbf4bc04fe853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 20/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From f7a6ad65a1351500852e93d1f36bd220f77492f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 21/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From aed884b9aeed238cac86c9f299d7d025b467a1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 22/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..9193369b4312 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,19 +1,20 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {

From e28a06a440a6144652d652db1415b5a8b2df9f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 23/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From bfc7a468ade486d2843ce6251655b41900de44ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 24/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 92481b9e8303548e25d78643c86df4b89d964e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 25/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 352d4ecfbd7aae80f944ab59b8162d29e5a948ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 26/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 1465b9276929a92e96aed3f5d0c63a351806c999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 27/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 7d1967da01d7..f82ecc74d2a9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (25 preceding siblings ...)
  2022-11-02 11:21 ` motorto
@ 2022-11-02 11:26 ` motorto
  2022-11-03  8:47 ` motorto
                   ` (23 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-02 11:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 68742 bytes --]

From d35cea6d0c2a208ca067483b244e815768d3d139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..e8bd2db0e8a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d195930d4eb9274f4047856398a80fde7cd380c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index e8bd2db0e8a6..402384fea5cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1698,7 +1698,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4196,3 +4195,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From f71bb0aa136c756bfea06e145a74395fb7b52759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 402384fea5cd..545fac8be581 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 8729fc15e89502c4b1a277ee112fe050562ad230 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From c203288cea821a6d82917203e89d9c9061a78874 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 545fac8be581..b6334070ac38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 3f035493cf0e079fd43dfd0dd0b5e186582c3a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index b6334070ac38..36b2cac01a7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4193,3 +4191,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 1b2db4d062e29bca293385dc35b2bf3b2e74b7cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 36b2cac01a7d..c492fab0e6e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,8 +560,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 96eed0a5736e71f8724688a9ac49eee2d2b4dbd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index c492fab0e6e4..9347dbd5935b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,7 +2232,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..c2f845512e37 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 84cffbe23c49585563615607905e0c84f954164c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9347dbd5935b..9364ef66a05d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2230,8 +2230,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 12e2b892857bcc78c86014ab16445a8086aa3206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f1e13d7b77db697680c785821a132bf2752a4ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 440cf2aac7abea35215312241d7f1474c7b1e5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From eadb0fab8977b00581933b7be2b3ef9652be8275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 553846ed2bd213099f229c7a47d93777b2499df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 02a3598b6eea80b88d40432bdd0653d037640902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 15/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 7f16d96d1df7f6b7eb28df96c18f02c7e39009f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 16/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 0eac7bed0b87f7b51935748c87a92f01c4219218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 17/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 939e62cfd37cf9f47c89747771e40b000b50d4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 18/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From b87470413b2a6b8f2f2c68157fb1ced4ea60b858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 19/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fb54773d60211e08c7e0fa1784e4aae703a3704b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 20/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From a0e720e1815ffdf337646ce2b47eb8405167eec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 21/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 86913c9ea2f374e43d562b89f65d1b65a104be77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 22/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..9193369b4312 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,19 +1,20 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {

From 4eab80d6369df52b9911db6def5864d324034732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 23/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From f383eae809bdc15e25e8efcc29fb53163c57a89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 24/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 29cb9e35cac512073ebde3dd9360d46823a199fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 25/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 3f7080b4e8ac6b046aaa2b88e46713b5edb21702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 26/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 99818862b2f130cc5e195415fea3a5d02ce5052d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 27/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 7d1967da01d7..f82ecc74d2a9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (26 preceding siblings ...)
  2022-11-02 11:26 ` motorto
@ 2022-11-03  8:47 ` motorto
  2022-11-04 12:20 ` motorto
                   ` (22 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-03  8:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-{musl,glibc}

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 69003 bytes --]

From 0a17c242b78029bba2ef20324416c26f0398a77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 095513f7a489..1cacf30d9152 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 51243eee16c70fae13e45f191091e32995827520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 1cacf30d9152..f23b7d502461 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1698,7 +1698,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4196,3 +4195,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 00efdae4e8481119cf9e1c9700b3d4130928ad2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index f23b7d502461..aaa0712a76a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From ed81b827c971a1fb53b22fc2b65c960a203cfe68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From c658baf136a4d1ecdfe79cae5c3b504f7360c271 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index aaa0712a76a2..27d9a41352bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From dc080823a9c0bd8c4f5a4e6d14e7450db862fee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 27d9a41352bc..571a3976e678 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4193,3 +4191,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From b36756988e44e767bd43d71473f1780a030d6410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 571a3976e678..d3bf1b5a2749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,8 +560,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 4ca635315c77fc35e63e1f709053e480be30c57f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index d3bf1b5a2749..94ac2ca47ec5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,7 +2232,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..c2f845512e37 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From bd95b4aeea99f231a757b2ce829618abcb44ffa7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 94ac2ca47ec5..2c47f9809fc3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2230,8 +2230,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 143a4ff49d06ce57aef0cec30caaa8371e8f035a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f39c647516219e1be8a7088403dca936cbdb3c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 988d5a867df00da8df113ba718c8ec2cef81db24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 8e2b91c458942b47136278024b3495b3e89ddc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From f642611e9c80736b95bf03aee9f447f079d4e8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 780085725b964511d164a51b349f2fedfa22fda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 15/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 285d75109ae00e5e2647eaee248b3cfe21a14914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 16/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 14b1f5cd757a265a0ed995839752951db41c0cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 17/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 3f82a021bebf51b6ca1c3642eb6598983bae7d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 18/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 8c1da5783124ba387f719cb70dcd0bb2f383e8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 19/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e7cc448af9eac93c03f08541644c1958f02198d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 20/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From fedb039dceb66a25e440633fa1ef571ed7972d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 21/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 1b06504500a9688844bbbe79c619839bd8b3b842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 22/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  7 +++--
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..7ccd38e31b86 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,19 +1,20 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -28,8 +29,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 05b7921ade49061723ab641fabbbdc0c9a9a3c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 23/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From e2b7fab7d544aef8ddf72dfee57d32c6dfe792ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 24/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 41c41bb158b2414e954f6349319904e179984c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 25/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 7bdfe2d9d52503a31f91c153fdeb7e6f117029a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 26/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 208244d0bdd7e42c446bfe3bf8f084a4afe12598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 27/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 7d1967da01d7..f82ecc74d2a9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (27 preceding siblings ...)
  2022-11-03  8:47 ` motorto
@ 2022-11-04 12:20 ` motorto
  2022-11-05 21:54 ` motorto
                   ` (21 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-04 12:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 903 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- I built this PR locally for my native architecture

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 71966 bytes --]

From cd2b5ef8c8edd4e6f0b30404b734fadc4dfb990b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 15943b843377..051a61a5b2f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3895,7 +3895,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 58f9c050a4639cebf9c097b7dfdcf06a158502a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 051a61a5b2f6..a1a82b1d0f47 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1698,7 +1698,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4197,3 +4196,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From f297a24525cfc47efe1bd3ad5a3f3e5112b7f45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index a1a82b1d0f47..e9562c98e716 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 92eb7efd783c20ae3f3fc86b2301afb5c2a89832 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 5c70c33f493495daf342aa601ea93d6e0a0fe07d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index e9562c98e716..109f51c5cc37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From f221818b181dae95b7e8ef27b7ca60569c979e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 109f51c5cc37..ba287a1ebbc1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4194,3 +4192,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 6de818970c1ebde0af458a0fe5a8d3336243867c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index ba287a1ebbc1..cf9490e9e208 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,8 +560,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 979fe770dfb8648b1e2679baa2a381ec1721043c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index cf9490e9e208..51a93d7cb93f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,7 +2233,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..c2f845512e37 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 34ce9f6cbea8cdf68e713a93df87b7c200b2a0f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 51a93d7cb93f..1cebe5a841e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2231,8 +2231,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 0224f50d6a87a3dba6316a2ddb8d6ac17b3f00dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 382a09aa98f1cd0d157ed4ff804ee6708a19ae4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..81e03c007551 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=12
+revision=13
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From a6b9fd537c9d5a07a5e8ae398da52a54415e5520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:21:24 +0100
Subject: [PATCH 12/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index a46cf9d79a78..1709747d9656 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 6580131c88c77f58afadc19f9df5e30925b1083e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 13/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From c860452bc1d6dcf5469a00e9c129c41659b8ea66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 129b7bc6080c71cbfb82b03207333cfaeada078c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:37:50 +0100
Subject: [PATCH 15/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 72e1439d9933..fe335e8f1709 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=3
+revision=4
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 5b146f017fe8d842e86277e82531a72ceef69ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 16/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 5639ac851701db233f2e99c4e2310993b7150541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 17/27] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 3590619b7bc8f7a31c2e699b21043ed6c0699348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:39:18 +0100
Subject: [PATCH 18/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 081da6334b51..0ad47a7fb9ef 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 6f02bc9507df4385b745366b43a2a65489ec21a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 19/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2a660ed23f33c582e6e33cdc8c6279b57d712dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 20/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From ab1aba0e411063b09431b7134ac6e59df829b34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 21/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From b067a7791e5af4c5892f3d7a456ca6d8774ff4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 22/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  7 +++--
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..7ccd38e31b86 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,19 +1,20 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -28,8 +29,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 81987fe63a5b683bcd3875ccc87dd4246e97a606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 23/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From ee8e0d237edc72b1dbfd6f85abd697d41b90da2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 24/27] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/openexr3.patch | 77 ++++++++++++++++++++++
 srcpkgs/PrusaSlicer/template               |  4 +-
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/openexr3.patch b/srcpkgs/PrusaSlicer/patches/openexr3.patch
new file mode 100644
index 000000000000..eb9b7ddf26ed
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/openexr3.patch
@@ -0,0 +1,77 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
+
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From a5858ce00174ad7d30631e41b9df97abf8d95896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:17 +0100
Subject: [PATCH 25/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 2a59b9c32599..29481e40a7b6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 9c48ded647d02d6e1d1369ca7e927848efd41a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 26/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 7d64714c616897108c29b37c4a355774a96e9fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 27/27] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 7d1967da01d7..f82ecc74d2a9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (28 preceding siblings ...)
  2022-11-04 12:20 ` motorto
@ 2022-11-05 21:54 ` motorto
  2022-11-18  8:30 ` motorto
                   ` (20 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-05 21:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)
- aarch64  (crossbuilding)
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 69218 bytes --]

From 992926eed5f2b00e322fecb8a2fcc8db15f40d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 11 Oct 2022 10:05:46 +0100
Subject: [PATCH 01/23] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5136df346db0..92a9b654bd2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3896,7 +3896,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 5e5ecfa0ae4f83661448ab3bd2832ba2fec9e848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 19:39:00 +0100
Subject: [PATCH 02/23] New package: imath-3.1.5.

---
 common/shlibs          |  2 +-
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 92a9b654bd2d..969b87a26ac4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1698,7 +1698,6 @@ libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
 libHalf-2_4.so.24 ilmbase-2.4.0_1
 libIex-2_4.so.24 ilmbase-2.4.0_1
 libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
@@ -4198,3 +4197,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..7ae4310e3e91
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath*"
+		vmove "usr/lib/python3.10/site-packages/imath.so"
+		vmove "usr/lib/python3.10/site-packages/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From f90ad49b1607ad56606423b87c6eef1757e3fb89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 17 Oct 2022 19:52:09 +0100
Subject: [PATCH 03/23] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 36 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 78 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 969b87a26ac4..f3c7b406143f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 39d18c405a959bba28855867398d4c174a876052 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/23] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 049e9faff90bc62f2b677a44fb64347617590c61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/23] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index f3c7b406143f..cefa6bf133cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 49a50bcd9472b34cf96f4ad99da2dd97dfb2a2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/23] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  7 ++--
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index cefa6bf133cd..eaed129e84cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,8 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1
 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1
@@ -4195,3 +4193,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 716a7228f093ab5beb6e1c67a74fe59743f2525d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/23] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index eaed129e84cb..11539a52ee48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -560,8 +560,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From a4d2e58efcd1efbe39088b3544e897729135f421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/23] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 11539a52ee48..b6560aa12950 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,7 +2234,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..c2f845512e37 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,26 +1,29 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 wrksrc="OpenColorIO-${version}"
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From e2de3223f063fbcdc6c66dba4b376d88f9dc6c3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/23] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b6560aa12950..641f8c5c1f41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,8 +2232,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bae68ead21e6..7118b5f2ed7a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
-wrksrc="oiio-Release-${version}"
+version=2.3.18.0
+revision=1
+wrksrc="oiio-${version}"
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -30,10 +32,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -58,7 +56,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7c8aed0f431d3003c6c504a14962b63f2502e8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/23] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3a9e511478df8e7bd8f1124baf9d309f6d2126fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 11/23] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 6f2cb49b9cba..d0a505a1a384 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From b0f3bc7ec6647e2de1d1a87f7bbf3e6dd1eec4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 12/23] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From c1945ee31148e5aea0f57337ce0b32a97548dabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 13/23] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 850b12d25645e4886c15bd46100fe028acd57f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 14/23] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 9d6363e774183a8f51fee790d038bf83ed6eba18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 15/23] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From c2d6e61ea1610c77e34ff745c2e359a6d9108eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:21 +0100
Subject: [PATCH 16/23] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6b0aeb532486ef58e5b09be0f9d316afae633256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 17/23] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From c003a4b334a14b811d9cfaf40de737f422e84aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 18/23] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9434438a97727a1b0b595abab77c9f56f21d979c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 19/23] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  7 +++--
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..7ccd38e31b86 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,19 +1,20 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=6
+revision=7
 wrksrc="${pkgname}-Version-${version//./-}"
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -28,8 +29,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 140491fb4598fad1199839ec59a7dd14ab780d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 20/23] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

From 299a48060420e51b9d8e2dc400e758eea16698cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:09 +0100
Subject: [PATCH 21/23] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/openexr3.patch | 77 ++++++++++++++++++++++
 srcpkgs/PrusaSlicer/template               |  4 +-
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/openexr3.patch b/srcpkgs/PrusaSlicer/patches/openexr3.patch
new file mode 100644
index 000000000000..eb9b7ddf26ed
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/openexr3.patch
@@ -0,0 +1,77 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
+
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..e7556453550c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 6d91676c4b05ba4249b8ab684415b433177021f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 16:59:23 +0100
Subject: [PATCH 22/23] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 0608fea3fbb2..b8f336bd9ab0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 19ed0a4d1729cb7b264eea03838be03f0838c814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 23/23] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 7d1967da01d7..f82ecc74d2a9 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 wrksrc=${pkgname}-${_upstream_version}
 build_style=gnu-configure

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (29 preceding siblings ...)
  2022-11-05 21:54 ` motorto
@ 2022-11-18  8:30 ` motorto
  2022-11-18  9:35 ` motorto
                   ` (19 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-18  8:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- aarch64  (crossbuilding)
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 66292 bytes --]

From 8d15248391e88b53b3c79ebf3a2c7a965d313ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/26] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 07296762fcc4..4d87ff805913 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 62166e1745ad471dae00f1d4e737f3a6d5e55c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/26] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 46 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 4d87ff805913..9de6e8d2f0a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..062dcaa93b22
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,46 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+wrksrc="${pkgname^}-${version}"
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8a8da926395263a13e41939d164bb253d3087200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/26] alembic: update to 1.8.3; adopt.

---
 srcpkgs/alembic/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 31c4da4a7a25eafea963153ec4bc5c6115464745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/26] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 7816247e38fe6f277a08ce0b5d774de66be9642b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/26] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 9de6e8d2f0a2..0f5966b38fbb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 593c1411e890db14a2075b27596a44fa99ac740c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/26] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 0f5966b38fbb..a14e758b4df5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From adcc890603bad3a2350da24351d1bf00442cc041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/26] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index a14e758b4df5..fe010e47243a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 0bd5623cb1e61bd62fb62ab51c3dccabcccf6ed0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/26] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index fe010e47243a..6e2f7bc38afd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From c864d8d934b00b5d47bc98f1bc0499dd2bceb7a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/26] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6e2f7bc38afd..4dd39e093e7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 497ce001eceefebf2a503409ff0c2b5e129e9491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/26] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From cc4b1f47874b227e92aac830148ed80d50f2935d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/26] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 6f3c7b2bc10e1d9bda5c18b2e12699497efae309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 12/26] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From dbc92cde8623bcb1f7a34a0f631ae7add752cbc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 13/26] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 3c94bf74f4390a78fe67dd766dd27efa0e63fb28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 14/26] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From bf27b098154c6758c2918732e64ee676919b646c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 15/26] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 953b1bad8a7994b04a8778608c34131363a02155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 16/26] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From fd987a2268fb67982aec92120aa5d47b32947a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 17/26] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 8a5a665bb30a1fc7394d452929548c9ef423ead0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/26] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From c55ccd786c8c75c6cbfe60117632c15066ed9655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 19/26] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 6b989335bb9681fb8f6b33cf34c05797f333af5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:07 +0000
Subject: [PATCH 20/26] libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2e5591511b71..efe7a2adcf50 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=2
+revision=3
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 18b4eecc7491d4abcc5acdc3bb7aea8e4cb85d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/26] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From e703509f0b3ea2761449873dcc3cc87f8998a087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 22/26] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From ec2667ab2c0e0fa17ab424518c38c1676ca1a4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 23/26] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From eda3dd17a353b0b48b739185da369a56e991a0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 24/26] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From a74ba9bd6ef55ea3a236cb753365f01aa48e8c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 25/26] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 081344eda473882ab6b34b5fc5431cb42b3b37ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 26/26] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (30 preceding siblings ...)
  2022-11-18  8:30 ` motorto
@ 2022-11-18  9:35 ` motorto
  2022-11-19 15:29 ` motorto
                   ` (18 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-18  9:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- aarch64  (crossbuilding)
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 66259 bytes --]

From 8d15248391e88b53b3c79ebf3a2c7a965d313ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/26] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 07296762fcc4..4d87ff805913 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 778f1973a3d8a284982ea136c39972bdbbe681ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/26] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 4d87ff805913..9de6e8d2f0a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 256421c2a8b69075b5b146755c7a443104b535dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/26] alembic: update to 1.8.3; adopt.

---
 srcpkgs/alembic/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From ab98069f9fc362e9b31022497c714c01644660b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/26] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From d46140185733c4c3d9ca026a5efe3565b9e8b49a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/26] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 9de6e8d2f0a2..0f5966b38fbb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 9b6a5f4f2c53b5c4e632b0843cf86e78907b6402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/26] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 0f5966b38fbb..a14e758b4df5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From e21eee8699a38a45a428f1b3c0afbfc07cb0fb75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/26] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index a14e758b4df5..fe010e47243a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 7755c8cfe5dbd3ecd9421b743854710192f85da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/26] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index fe010e47243a..6e2f7bc38afd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 434c22a22d48765efe5dcfea72d38042db8c78fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/26] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6e2f7bc38afd..4dd39e093e7d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 43ed0d9515da18fa6b4e15b6cf0ae4dccfb3b3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/26] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 2b5ab26a0c0b516371b551b28382ef1dd969602e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/26] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From e97402b3f0e57a86dbc972e75b2114176b74ea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 12/26] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 7d7b1b73b730894e7e001d0bf360c94b3b02bf68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 13/26] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 3219b69a4a5d6ec083ec094dc2172b7c5df68df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 14/26] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 4a71c29a87fcb022c2fccec03c7753b6c12cc8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 15/26] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From f6e5c9947e25cf2d3909331650414317f42544ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 16/26] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 46069ffd0da7fce2e41222d2a4fa638f37379d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 17/26] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 0983fa5495f2cc700e33aad601d39620e9739fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 18/26] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From a2c6b3f8fe1bd16635f5bf2618a7d0fd9603af68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 19/26] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 67e01dc540608e6359d774d5b7907ae0c92ff808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:07 +0000
Subject: [PATCH 20/26] libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2e5591511b71..efe7a2adcf50 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=2
+revision=3
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From ebaed2a3a4e35d0b917214f09023c681198f5e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/26] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From fd6aebb4319d88030dd551629bba8ce43955d790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 22/26] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 3e17b53baea830aa293503e68a95b644946ec8bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 23/26] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 900251ca3ca8b6eb1fc0be95254b7c0ef0f15c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 24/26] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From afedee6a149fa55856088bb9732186988cad0711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 25/26] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 79afd90a95ba6aab2813db29dc2b9cc702f5e4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 26/26] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (31 preceding siblings ...)
  2022-11-18  9:35 ` motorto
@ 2022-11-19 15:29 ` motorto
  2022-11-20 10:50 ` motorto
                   ` (17 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-19 15:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- aarch64  (crossbuilding)
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 69085 bytes --]

From 8d15248391e88b53b3c79ebf3a2c7a965d313ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 07296762fcc4..4d87ff805913 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 778f1973a3d8a284982ea136c39972bdbbe681ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 4d87ff805913..9de6e8d2f0a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 98b274f221d170dcdebab6371ddcac2ad8a9810a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9de6e8d2f0a2..a305b4e1167f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3891,7 +3891,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d810cac4b70d4fcf7122a31283d81f55520ae7de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From b3017b7b7bc0f76a1699e8f0d8fdb726e2777a36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index a305b4e1167f..e5ab3d324589 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 915b890cbb35c4c24e6aa49fd1ce82401b6921c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index e5ab3d324589..3ead72e4a33e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 3a773130b3da4888dcb4572a0b407c61426a9789 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 3ead72e4a33e..528d8ba3fa7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 8f5c41d24585af0173f25ee5b2d0e05dc0400060 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 528d8ba3fa7e..8e7dec0873a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 89e1e44f9f902696c3bb9932f0db5b80e9674ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8e7dec0873a2..165142f5fe92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From e49a1f671381b534d2b40cc3378e8fe68399dc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 3eca8f617b18fe8094a5a3c4e11d857d152551bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From e6bdc1eaf77eeced732958ea01e6a52fd849a3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 8a7ffc04904a..810e5b534d92 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From c44b725cb24e3c8dc8a3a4aacf397e7021e14d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 3d3485e95c4cc19d3acf07ca9d3873ba492cf395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From ba6cdba34273269fe3b90ee3be57ed019773d01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 4590ae96f231a2e3433c9245a46b787f31d9b56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 512b88d2943ff93fcae663ef3dbf0bd8f43d47a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 414e1e16d2ba24249395ef64919f48bc801994e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 303c508f07033a80ae75b90e827b4253317c6f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From d7fb0cd60755be061751c96061bf68954808d731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 792c11b6c8dc07abc71cce6634c4eff95f4a72b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:07 +0000
Subject: [PATCH 21/28] libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2e5591511b71..efe7a2adcf50 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=2
+revision=3
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 627bb5062b632822fcd972ac085cac8e8fbea099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From cbd45b3783ea213c17b5e292053422bbdf7d4773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 04192fbc001893310275834092acba6e7f17ed6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From f832502b17c7a117f0d1ed0e7529067a4aea2355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From e04d82098cb50eaf70a64e9ab833cf5e93274c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 66a999d9c7ea3302b159ea883f45ebdb5c63c0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From e7c462d80ecae968f0ad2f2b0ebc993e4561eed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:56 +0100
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (32 preceding siblings ...)
  2022-11-19 15:29 ` motorto
@ 2022-11-20 10:50 ` motorto
  2022-11-20 10:53 ` motorto
                   ` (16 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-20 10:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)
- aarch64 (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 70751 bytes --]

From d1257e0328675d94558324642a17112ac82b16eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/26] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index c103447f8b31..c200e8944b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 4d9e5e53c48d54591dda0f85b719c6451857f4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/26] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index c200e8944b81..7847b7a5e10f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From a85f5c66f497192118b1c6ebc7bd4dfb7e5fb6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/26] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7847b7a5e10f..95b9017f16e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3891,7 +3891,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0c7b12b7865abc5809ba18726b46ed065f451fdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/26] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 9618b97f6e51b09bc8e54c64ca8db2efd1a7485b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/26] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 95b9017f16e9..5f36a8659bca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 3c751ee9c4c1428920994da2a015b4a8eb1e96d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/26] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 5f36a8659bca..2129ce53115e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d75b440952bc1c0d3bfde6000ac9d6aa800669ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/26] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 2129ce53115e..7cd840a9ea04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From fb5a1a5b690ff740f9bf15bb8b2e1793d07ab33f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/26] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 7cd840a9ea04..6c020a29bc57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From d56d2f2a2e1baf134f22404fbbaf70c2f1b29df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/26] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6c020a29bc57..5a0bfb3bb76f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7a8cab1aa46ea0c5a80865a894890d1d1dc60d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/26] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 140e96cb445b44f3b227f38361fa26dbbface126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/26] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 9a1392e676b45baccf0e7276d083c8038af467dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/26] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 8a7ffc04904a..810e5b534d92 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ca96d29961a83f57d3c6e0a26131b702ee086062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/26] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 4ad685121bd0d7e77a7f4e05e48ba513973fc08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/26] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 1233b2c0acd0f95c8e56364bd9f9dc3b8a11edd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/26] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From ecdb2ad7728941c0283dc487c9cf4dfa5c860215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/26] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 70670fcc86fbb9e10fbf078d71b3ac4c7601b342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/26] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From fc4c984f14289b305955c770f9014fec42e651ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/26] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 9c6f8e95355cdeb470ccfe3059f1b6e1396e489e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 19/26] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 75db58e50848a825f8c9b5d465255de6581899a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/26] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From c8a757d5d4810fa94e2fa4f4f7dc43067bb592d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/26] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 1837722a079b29b4ce95b1378a50577fc3148ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 22/26] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b9e043c997b41dff0eebfd0534f5c34a14591412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 23/26] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 51395a42b869f28fae849739ce642df330d6cb38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 24/26] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 3f4b49c127445c1b4004783db7061dfb39b5d93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 25/26] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 88f8b40738501a1dcf360c9a1bc0ec1cac7de8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 26/26] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (33 preceding siblings ...)
  2022-11-20 10:50 ` motorto
@ 2022-11-20 10:53 ` motorto
  2022-11-20 10:54 ` motorto
                   ` (15 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-20 10:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)
- aarch64 (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 72102 bytes --]

From d1257e0328675d94558324642a17112ac82b16eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index c103447f8b31..c200e8944b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 4d9e5e53c48d54591dda0f85b719c6451857f4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index c200e8944b81..7847b7a5e10f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From a85f5c66f497192118b1c6ebc7bd4dfb7e5fb6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7847b7a5e10f..95b9017f16e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3891,7 +3891,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0c7b12b7865abc5809ba18726b46ed065f451fdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 9618b97f6e51b09bc8e54c64ca8db2efd1a7485b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 95b9017f16e9..5f36a8659bca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 3c751ee9c4c1428920994da2a015b4a8eb1e96d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 5f36a8659bca..2129ce53115e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d75b440952bc1c0d3bfde6000ac9d6aa800669ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 2129ce53115e..7cd840a9ea04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From fb5a1a5b690ff740f9bf15bb8b2e1793d07ab33f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 7cd840a9ea04..6c020a29bc57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From d56d2f2a2e1baf134f22404fbbaf70c2f1b29df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6c020a29bc57..5a0bfb3bb76f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7a8cab1aa46ea0c5a80865a894890d1d1dc60d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 140e96cb445b44f3b227f38361fa26dbbface126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 9a1392e676b45baccf0e7276d083c8038af467dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 8a7ffc04904a..810e5b534d92 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ca96d29961a83f57d3c6e0a26131b702ee086062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 4ad685121bd0d7e77a7f4e05e48ba513973fc08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 1233b2c0acd0f95c8e56364bd9f9dc3b8a11edd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From ecdb2ad7728941c0283dc487c9cf4dfa5c860215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 70670fcc86fbb9e10fbf078d71b3ac4c7601b342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From fc4c984f14289b305955c770f9014fec42e651ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 9c6f8e95355cdeb470ccfe3059f1b6e1396e489e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 75db58e50848a825f8c9b5d465255de6581899a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From c8a757d5d4810fa94e2fa4f4f7dc43067bb592d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 1837722a079b29b4ce95b1378a50577fc3148ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 22/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b9e043c997b41dff0eebfd0534f5c34a14591412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 23/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 51395a42b869f28fae849739ce642df330d6cb38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 24/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 3f4b49c127445c1b4004783db7061dfb39b5d93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 25/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 88f8b40738501a1dcf360c9a1bc0ec1cac7de8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 26/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 74dc5ded26f3f10fc6fe0eb8b07ee7ed02243448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 27/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 15f905d5556c70770f4a88fe36453e221749c426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (34 preceding siblings ...)
  2022-11-20 10:53 ` motorto
@ 2022-11-20 10:54 ` motorto
  2022-11-23  8:39 ` motorto
                   ` (14 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-20 10:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- aarch64-musl (crossbuilding)
- aarch64 (crossbuilding)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 72102 bytes --]

From d1257e0328675d94558324642a17112ac82b16eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index c103447f8b31..c200e8944b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 4d9e5e53c48d54591dda0f85b719c6451857f4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index c200e8944b81..7847b7a5e10f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4193,3 +4193,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From a85f5c66f497192118b1c6ebc7bd4dfb7e5fb6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7847b7a5e10f..95b9017f16e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3891,7 +3891,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 0c7b12b7865abc5809ba18726b46ed065f451fdf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 9618b97f6e51b09bc8e54c64ca8db2efd1a7485b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 95b9017f16e9..5f36a8659bca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 3c751ee9c4c1428920994da2a015b4a8eb1e96d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 5f36a8659bca..2129ce53115e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4195,3 +4195,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From d75b440952bc1c0d3bfde6000ac9d6aa800669ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 2129ce53115e..7cd840a9ea04 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From fb5a1a5b690ff740f9bf15bb8b2e1793d07ab33f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 7cd840a9ea04..6c020a29bc57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From d56d2f2a2e1baf134f22404fbbaf70c2f1b29df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6c020a29bc57..5a0bfb3bb76f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7a8cab1aa46ea0c5a80865a894890d1d1dc60d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 140e96cb445b44f3b227f38361fa26dbbface126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 9a1392e676b45baccf0e7276d083c8038af467dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 8a7ffc04904a..810e5b534d92 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From ca96d29961a83f57d3c6e0a26131b702ee086062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 4ad685121bd0d7e77a7f4e05e48ba513973fc08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 1233b2c0acd0f95c8e56364bd9f9dc3b8a11edd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From ecdb2ad7728941c0283dc487c9cf4dfa5c860215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 70670fcc86fbb9e10fbf078d71b3ac4c7601b342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From fc4c984f14289b305955c770f9014fec42e651ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 2c5b437853ef..b7aad9493521 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.99.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 9c6f8e95355cdeb470ccfe3059f1b6e1396e489e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:38:45 +0100
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 75db58e50848a825f8c9b5d465255de6581899a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 8da2ebd23ec5745ffc369cbbacc586801fcfe501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 5976475825dd8f75e8c2c91bbadbcf3e04680a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 98a896884018689b0dd164151785ace0c2b13455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 12d27ddcb84f292f4ae00f14dff53c24e3496949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From ac2e94fd8b10301d1e739187c8369e3fa6a17576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From e24382e5f2b5ff787bece1e26d903efed8f77a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 45aeaebb92eb928fc448b272f22b5d6e29b02e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From bd9f8eebad89903db07d7845015869a523f02892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (35 preceding siblings ...)
  2022-11-20 10:54 ` motorto
@ 2022-11-23  8:39 ` motorto
  2022-12-23  0:43 ` motorto
                   ` (13 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-11-23  8:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 71305 bytes --]

From 2852e1d149c20a10cbe840eb07cb3ce15ae4288a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 37895879b1ba..680f87a6b522 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From a4223926b230048fcbb5ebc102d40194c3e5dc18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 680f87a6b522..03e10e7d188f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,3 +4196,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From cdccdac3acafa827db36b00f06cf64af05c0bdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 03e10e7d188f..adc54c405c16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d289a187fb22a91dfb1afc8d05a1ea582d645a8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 399ac3d5278c62ffc4c2f0239de917aade30e630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index adc54c405c16..eb4ead53a8dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 7f135690048e9542fb4821201ab019e0df4fb7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index eb4ead53a8dd..262680999899 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4198,3 +4198,8 @@ libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 5357a38fecb7d92af3b9985507e18192985bcd2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 262680999899..70accd6b714b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -559,8 +559,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 14d4e2324ea9335f1b99481606a1076aef48ad2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 70accd6b714b..d88498b189e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 4c6e282b18d77b4e28de0b429e7d0d422d70c444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d88498b189e5..93238bc557fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 4d8dd8cc83c79d3220a5448347af4a5feb154b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 8d6b11eb3afee1681d941f17a903ccb07925b59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/27] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 9056c53f92cdb067763024993aa0cce4d2e350e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/27] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 8a7ffc04904a..810e5b534d92 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From c10152044c4e6105392fc8f315b1f8c6ac26f7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From c3dd5ae3fa04716139bbff9fc78d076916d6f95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 53d843730405621db8e60f94133abb0153c3351d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 272c9ab09d23bc0836226ac21579f3b0aa10c058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..dd57fb173989 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.30
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 51b6b70fd3ad4c7d0162eabe53eafd9902b6e177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 9f979f2e2a44c699296ea5248505a4d49e972afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index e1602c5232ca..fa33078c4756 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 43af3af104eb6a0c07cdcc7ad14cfad62381f032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 1297ed0c9f6d6506406e9c59b414aa33c2ed514e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 20/27]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 9f47d6fac2e9d84b764c58da2b28d8e8ab7a0497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 30867050548bc3c25fd2f7f96cad9058852551f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 22/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5de6980196606bfe08af84cf6f638eb15c0b30ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 23/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 8f537421f21cbaf71dabab2ed8dde1f2e2cb2562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 24/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 82f315dc8ea4c661c3e8f0959a0be642ce4b75b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 25/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9620dfdb99b6853e0d8387aca08e95eb57b63edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 26/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 376d4a60cecfa29ea3799666f55321aeceda4ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 27/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (36 preceding siblings ...)
  2022-11-23  8:39 ` motorto
@ 2022-12-23  0:43 ` motorto
  2022-12-24 13:22 ` motorto
                   ` (12 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-23  0:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 71133 bytes --]

From 746789e1c30c46082771db833efafd53494dc3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5d529d61fcc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 5a3790fb72a5dcb2c33dbb776b4102a764530bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5d529d61fcc4..eb1f37c3e60d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4216,3 +4216,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 78d7e925dea5cbfb643ac5f6bedd58560d31331f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb1f37c3e60d..7d5041251a1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 10aa846a1fc4c01ae57bdd63d4314aebef0912e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From d3f15197a467a05d2100064e975c1a52255bed9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 7d5041251a1e..030307bb74f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 47aa3078c8e31b7a1bf41e048dcf9f2db6c2dfe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 030307bb74f1..6848ba4e8904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 945a523151c1015c7f062537d8a67f4133410478 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 6848ba4e8904..65b255342cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 2c8c38aab1934d79b9c729bc60272bde9abf1215 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 65b255342cfe..d589c2d860ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From ad7848838e100342e737dc238e7b96d90f653648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d589c2d860ba..f4e1f076e0b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 839edfe7052a15d326fa8a4a267279a8486d096b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 78feeee1d49202fb68e7ea91f3612e2797e51acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/27] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 1f6c5932535b119342a4ab197219eba30bddda73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/27] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 741beab29f294e16bd2b171a10c2ab57fcce7ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 7c26811dab9f7e05fe58772cba63c09e119e3826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From c9d28b5b3a0f3b0a26a30248d883262126526ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 3eb5db89fdbe1a21b38b41bc8dc7c69d1a19beae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 1fa32cebbfb6da0c5325d9a7f2712fffd5349983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From dfdf9d5a08712207f15e3ac139be2ffd7335cbdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 34ee1efb29a013dea6007f300181337547aaf6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 9d7d3913de71d6a8a99caf3cf32ebb2fb66a2bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 20/27]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From f1ac8bd27967eb321bf97932d4f10a8529c8bad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From ab5eea3f8dcbd216400f8c67dbfa7f55d32a307f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 22/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 4750b87c41359ce546de022c186db899872bcb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 23/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 3f994ab1a9df10db8f26c3227c7ea8eddeac8603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 24/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 29f268e91d9bbcf1345b65de416481759517917c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 25/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 292e7285ab4f26262b7fb259b06c16e5ad6d0261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 26/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 342484d48f289ef8571366c3292349703c019fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 27/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (37 preceding siblings ...)
  2022-12-23  0:43 ` motorto
@ 2022-12-24 13:22 ` motorto
  2022-12-24 13:25 ` motorto
                   ` (11 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-24 13:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 71133 bytes --]

From bde3b5e71e66b6da7307438f98f61b8e44adcb2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/27] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5d529d61fcc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 74aca7aec6a0c6eff35e57ec654964ea8793073f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/27] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5d529d61fcc4..eb1f37c3e60d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4216,3 +4216,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From e7dd43f16fc15d6e37d13fb5734fbfa9f03bbb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/27] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb1f37c3e60d..7d5041251a1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From bfd38cf4c87d78b60c422282c5f8b90216e0e936 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/27] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 1581637e31980fdd3a97f4d3e1c43bc5b242222f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/27] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 7d5041251a1e..030307bb74f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 7f554a519f224468c755ea4421ea639542f78cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/27] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 030307bb74f1..6848ba4e8904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From f6ba65692955b2e61160e9dee98e34857e3ef895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/27] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 6848ba4e8904..65b255342cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From ce00ccf7a614531a4c65ec7aafd6c25c55aba223 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/27] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 65b255342cfe..d589c2d860ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 3584a88802ecedd4478d6e7fc8624757ca9acfe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/27] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d589c2d860ba..f4e1f076e0b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From b3e4644a3191fc014676b27c256259c8e5cec399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/27] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From fcb97ec6bd92c804761abcbc992be5acfe4efacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/27] ImageMagick: revbump for openexr3,fix tests

---
 srcpkgs/ImageMagick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 11554f7a497b..eac723eb9e53 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.51
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib
@@ -12,6 +12,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
  libraqm-devel libopenexr-devel libheif-devel"
+checkdepends="ttf-opensans"
 short_desc="Create, edit, compose, or convert bitmap images"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="ImageMagick"

From 0f8dc52ac1a838a2133e98be7d501bfba5ddb0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/27] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 11a93bcbd19bf9448ea7f24e84348f860f158e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/27] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From f7e7f94f20df252f55381ce1d12ba6d3ff1d35c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/27] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 4cd7dde9fa6fdbc30375768e45fb7f6059c94b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/27] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 94dd43d5ec227d217ad6329f53b4831826d4f0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/27] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From fef83d9baef12c75ebc25e7b4ea3f2fb18f8019c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/27] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 346f592208f8e6f842f215227a01f867c7967a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/27] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From e0ccaa2db708f553ddc8654ba1e01a36428891ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 19/27] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 8f3bb433063700dafbc030dfd835b5ecb9d1f654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 20/27]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 059820e861fcb94200e2f245dfb44ac05b10eb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 21/27] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From a060141563e54794fbe28c89cdf82f24b85b87f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 22/27] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cb8ece0ddd3af5575864b97c1dae34dc11da45eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 23/27] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 5a95f43cffc4cf25976838b92527271d1b97da5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 24/27] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From b8bfe14340c06cfd0c773b4a8de3e393e5d25e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 25/27] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 4e134497918a624de3beb5f5aae94f5ebe6f1681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 26/27] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From f44465d8619ee04e346c4535f33f17c6995ae1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 27/27] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (38 preceding siblings ...)
  2022-12-24 13:22 ` motorto
@ 2022-12-24 13:25 ` motorto
  2022-12-25 18:40 ` [PR PATCH] [Updated] " motorto
                   ` (10 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-24 13:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1364530135

Comment:
Ok so having some free time this days so going back to work on this, merged master and I am on the process of building again for x86-64-glibc/musl, i686 and armv6l (cross). Just to check that everything works as I left it, aka the only issue is with PrusaSlice cross compilation failling

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (39 preceding siblings ...)
  2022-12-24 13:25 ` motorto
@ 2022-12-25 18:40 ` motorto
  2022-12-25 18:46 ` motorto
                   ` (9 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-25 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 71443 bytes --]

From 4cbd5d0014459da9f510ae7891be9c41e8cfa816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5d529d61fcc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 0a3bf984ad2f815fb424a07356223ba294a6f89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5d529d61fcc4..eb1f37c3e60d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4216,3 +4216,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8a21d5669543a2903817f1e2566086ad2b7a7b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb1f37c3e60d..7d5041251a1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 24c0ed4e33bbd6a24895e884590ae9fd3510a2ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From b3674897212803447ea42240229f711fe9ba4ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 7d5041251a1e..030307bb74f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 6a2ef98f01414030412ab4ab470d11e551b87526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 030307bb74f1..6848ba4e8904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 9fe6630d370a36335c98ad646fd410836dcc621d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 6848ba4e8904..65b255342cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 917c634e194b72cd85c62c3aafb060e345325c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 65b255342cfe..d589c2d860ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 14e2e0417fb897f572636bfe1bc94f44c5b7b5fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d589c2d860ba..f4e1f076e0b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7f8ca6228438952d590fd97e47e5cd1d46b7b0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From cd63a3b15e0f3bb341fa243cb41a1b90fd96f2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From 5bf43ca096719cdb3bc9c75d220cebe98ae5b39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 7f7dd1df6c794c8074d34767b837835231bfa1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 54f2c3ebf1b677910079bfac4ff64c1a7c79e990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 50fe113d7e777958560c59678fad6114e88a9a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 8d1e2c7612009dac87aeb612988dd6fe4602b652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 164dbe54d891c279015721d7cdfa4732ecb1c104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 538125f7001b7e16c51509cb1e94edf082c4c88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 72a55659b469fdbf534af3d757efc05f829e24f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 97f3e4832f9d201cd839b1de8a211febf0039cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 4eb4fe80a67d37acd9e4d58607bc4e5993e05ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 6ab1ae1a458b61a661e3a0497bdd44dfa3184d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 153c3befcd1df497147694fd16b08b2d78bdfab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3639b87df4f9975e7d58b81d69451f3fd15153a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 602fae3f13734793a7d4e36d49a2137906fa523a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From a2bb6ef363a3fc432427d7ffbd47786fe06f68d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 08ee9636726d59f196eae25aa5fc6ff0ab907916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 603f674ac17467d3b9f920374a3e706d8b42172c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (40 preceding siblings ...)
  2022-12-25 18:40 ` [PR PATCH] [Updated] " motorto
@ 2022-12-25 18:46 ` motorto
  2022-12-25 18:49 ` motorto
                   ` (8 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-25 18:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 74358 bytes --]

From 4cbd5d0014459da9f510ae7891be9c41e8cfa816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5d529d61fcc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 0a3bf984ad2f815fb424a07356223ba294a6f89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5d529d61fcc4..eb1f37c3e60d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4216,3 +4216,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8a21d5669543a2903817f1e2566086ad2b7a7b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb1f37c3e60d..7d5041251a1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 24c0ed4e33bbd6a24895e884590ae9fd3510a2ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From b3674897212803447ea42240229f711fe9ba4ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 7d5041251a1e..030307bb74f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 6a2ef98f01414030412ab4ab470d11e551b87526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 030307bb74f1..6848ba4e8904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 9fe6630d370a36335c98ad646fd410836dcc621d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 6848ba4e8904..65b255342cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 917c634e194b72cd85c62c3aafb060e345325c79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 5 files changed, 28 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 65b255342cfe..d589c2d860ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 14e2e0417fb897f572636bfe1bc94f44c5b7b5fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d589c2d860ba..f4e1f076e0b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 7f8ca6228438952d590fd97e47e5cd1d46b7b0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From cd63a3b15e0f3bb341fa243cb41a1b90fd96f2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From b02d159f1c25a99c09774693c661836c71a072a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/cereal.patch      | 72 ++++++++++++++++++
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 3 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cereal.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal.patch b/srcpkgs/PrusaSlicer/patches/cereal.patch
new file mode 100644
index 000000000000..0c168bac14a5
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cereal.patch
@@ -0,0 +1,72 @@
+From d8ac66558c3e0dc758f963d554850eaf378892a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 25 Dec 2022 18:44:02 +0000
+Subject: [PATCH]  Use namespaces to link against libcereal
+
+---
+ CMakeLists.txt               | 6 ++++++
+ src/CMakeLists.txt           | 3 ++-
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt    | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01bb73..4153e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -474,6 +474,12 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e89e82..373c301 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,8 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
++
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 99d010d..058f1b2 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    libcereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 34cc980..331fdc4 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+-- 
+2.39.0
+
diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From b44bcf1a1082f2abfa104ab807a3df40af689101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 759827556ad3711a6ba4a151454b518eb40eead2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 36ce44f536da4f0cc73dd1acc12f5f4c94093b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 147b02b50a73d7d9a5e1634101c8dcb64752d7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From afde79becebecb9db3148f5177133db918e419af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 1d27b21226f18499defea3e7ef0849678c937515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 1da1a806132be03dc9c774b98e63ae33ddded6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From b521fbfe0b84f14cd63ff5a937cc9fcb333fbbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 0cf94bfb53e996505fc1f95537be5f43355cf905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 3d4d67ad178be8f56299a2f5a12071f7886bf268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 8a05648a82917fc81d9cb2746d85853897c9e218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f6ba743c301656814463008fd91770232fa79839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From b378973439a45241e4274b0e1fe320b229d2486b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 8fa6674155f32b9959d0780ea92bae4399392eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From b63135ecc0e5128268ebee3e2fe58f930b6b0f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 78c023494349bce73d33eeb6aa471ba3a4090649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (41 preceding siblings ...)
  2022-12-25 18:46 ` motorto
@ 2022-12-25 18:49 ` motorto
  2023-01-02 14:05 ` motorto
                   ` (7 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2022-12-25 18:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- PrusaSlicer: Failling to cross compile

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)


(my dual core is in the process of testing more cross-builds, might take some time but It didn't fail till now so I am going to open it for review).

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 75083 bytes --]

From 4cbd5d0014459da9f510ae7891be9c41e8cfa816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..5d529d61fcc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1694,10 +1694,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 0a3bf984ad2f815fb424a07356223ba294a6f89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5d529d61fcc4..eb1f37c3e60d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4216,3 +4216,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8a21d5669543a2903817f1e2566086ad2b7a7b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb1f37c3e60d..7d5041251a1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 24c0ed4e33bbd6a24895e884590ae9fd3510a2ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From b3674897212803447ea42240229f711fe9ba4ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 7d5041251a1e..030307bb74f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 6a2ef98f01414030412ab4ab470d11e551b87526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 030307bb74f1..6848ba4e8904 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 9fe6630d370a36335c98ad646fd410836dcc621d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 6848ba4e8904..65b255342cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 8a4331446127b9e2651c6675aebdafe6b3d4cd38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index 65b255342cfe..d589c2d860ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From e74b7cfc7b69e6ab1658d042faff0d33c13cdeb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d589c2d860ba..f4e1f076e0b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 90573bbf18fa6ba4823145a2011fec975e4c733e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From f5fe806e1c7d53e2c3f419f15023e476b1f44847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From d166634ef298c4bf26d3af7edc126b316a982f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/cereal.patch      | 72 ++++++++++++++++++
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 3 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cereal.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal.patch b/srcpkgs/PrusaSlicer/patches/cereal.patch
new file mode 100644
index 000000000000..0c168bac14a5
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cereal.patch
@@ -0,0 +1,72 @@
+From d8ac66558c3e0dc758f963d554850eaf378892a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 25 Dec 2022 18:44:02 +0000
+Subject: [PATCH]  Use namespaces to link against libcereal
+
+---
+ CMakeLists.txt               | 6 ++++++
+ src/CMakeLists.txt           | 3 ++-
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt    | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01bb73..4153e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -474,6 +474,12 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e89e82..373c301 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,8 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
++
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 99d010d..058f1b2 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    libcereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 34cc980..331fdc4 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+-- 
+2.39.0
+
diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 3713e40e6e470889cacde16efbdd596f1d0df741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From cc42a577c44b39ff121b3951af1b021109584ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 6fb7d2276d3e3ed9695b3b2268868cddae0854ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From b97578e0451e7f19e20f0daf74f7fa41d19cab3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 3ab805c00d9e78a744adca79059267e9f4a2fb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 820d052372afe318b482eb5b2dedbc3e1f8bf0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From c683a897951bcb349224afd8afaf494e6cacb526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 2182cc1893dbe722829d0e571a6b81ef2250dfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 700556f72fc7fffd3045ffaa2b0c0a736ae63920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 39b6c7a48f4eac60eb7d171ea76bd60145bd9de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From d1c28281a202b1ea542ef182ab676785394172d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From df136227f0a78adbe560563082fdf0e6e58d0ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 9004f0296711ea43a21fb18ce7d321f1c30b8b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 46e34509720abb706a5a18c97e653363ba8ce7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9f8e9e11063e69a75a1801ee64f803aef1a4b620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From bc0cac9b34b57dc40f09d20cbd6a2079c4bf7c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (42 preceding siblings ...)
  2022-12-25 18:49 ` motorto
@ 2023-01-02 14:05 ` motorto
  2023-01-07 14:22 ` motorto
                   ` (6 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2023-01-02 14:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 75083 bytes --]

From 7ac238239bb1e2eb1de719d2885b7418347a1eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 84c17ee8926a..5a6dcbee0f54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1695,10 +1695,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 976bd19d4acc41d026404eb783bb17af30d05fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 5a6dcbee0f54..e0e67a498287 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4218,3 +4218,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 031444ecea046638eead0a7ad0e69520cdd0a4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e0e67a498287..f52484aa3145 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3899,7 +3899,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 71a9080d83fc7c65843d8f169dac28f1f3b0cc17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 979e866596371ce718165962248e5ee74e6913b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index f52484aa3145..93fbef11163e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 80c364e5cc91d4308e8beafd3200b22492b65892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 93fbef11163e..ace9b5f6255d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4220,3 +4220,8 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 47b0927c48960b9c7d8984ed385f414b22536026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index ace9b5f6255d..cb121a44fbad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From f6f1b1ad5cd009f8b24d9167ea642faee8869e1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index cb121a44fbad..47b5a4bd95af 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,7 +2236,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 4a97063ec05ad70afc877c7bbf195bf7975ae86f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 47b5a4bd95af..17a65068e792 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,8 +2234,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 0e07f017030b..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=4
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From fa56cd36955ace35034808e41c98af03c65ee0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 9a5af0034d14..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=3
+revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From a515ab3b6dad2e2c8164fac36950009be8084a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From df073e71ebbb752b45ce1c3a3b61e3e574ae00a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/cereal.patch      | 72 ++++++++++++++++++
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  4 +-
 3 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cereal.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal.patch b/srcpkgs/PrusaSlicer/patches/cereal.patch
new file mode 100644
index 000000000000..0c168bac14a5
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cereal.patch
@@ -0,0 +1,72 @@
+From d8ac66558c3e0dc758f963d554850eaf378892a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 25 Dec 2022 18:44:02 +0000
+Subject: [PATCH]  Use namespaces to link against libcereal
+
+---
+ CMakeLists.txt               | 6 ++++++
+ src/CMakeLists.txt           | 3 ++-
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt    | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01bb73..4153e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -474,6 +474,12 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e89e82..373c301 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,8 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
++
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 99d010d..058f1b2 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    libcereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 34cc980..331fdc4 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+-- 
+2.39.0
+
diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25283bb1ab02..982d21d45a8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 50c420aae74ac199cdfc5dab35a2a56dde3fc2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:48:34 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 29481e40a7b6..e15d810c8929 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=2
+revision=3
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From dfe30c0ce0f2b2f96c310b6bef551519a5a30a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index ba3d66ea745a..3ba8ef8f9dbb 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=9
+revision=10
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From e92b1cb49c1fe582ff038723cfa5e88efe3ce95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 299d9e42d2aa4b7a970cdb1b3fe2642e4357a191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 96fe81ccd3cd762b68a47c809aca68fe32e2507d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:52:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index fe335e8f1709..ab38812dc634 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2021.0.0
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From ef6b0ade3a50ca9e30ae4c6051d13e838d4d197b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 64587b38580be9066214b3fe02e2215c5b80d2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 0be53d9206cdc17224ded981a0a8e990a3e5aef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 62926e6e56be74d6d4c07a55d53e9f624d33ff8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From ddf7d51c9bd0f083041f16c45883abe6dde93052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From fab3b01c5e9d408225f7569a9b702f6ff5bc1133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 24bc2253828b..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1c4311be6b8e60d498aaf664f777c2d237b05892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 715449652f35b8ecd5da9bb440f9a044c556b403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From d4eca50f7c108c38c16801ffe2834bb0c36998c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 51cd6103462c5b2c71130594c186d255b2918bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From f9c72e8bef51a1378e2e9b5dacc165dc1ae25e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (43 preceding siblings ...)
  2023-01-02 14:05 ` motorto
@ 2023-01-07 14:22 ` motorto
  2023-01-07 14:27 ` motorto
                   ` (5 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2023-01-07 14:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 72858 bytes --]

From 046494778d261b414833e2cde692c476d685c0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/26] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index f4f5acece3fa..86c07a24ed18 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1696,10 +1696,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 5565b72ef64de9467d8b2ac021d3acd87585d908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/26] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 86c07a24ed18..d6f48876e031 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4215,3 +4215,4 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 124a94a1978841df3b8cd3aaa71ab45ee543a3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/26] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d6f48876e031..fe5f134e3702 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3895,7 +3895,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From b8a1352e546eff18970aa468887a54ab5025e603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/26] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From f027c93840275d96793b03dc65534de19b729ae5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/26] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index fe5f134e3702..03092c6acb66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 65bf56867ee5ef6a083a9ca79f524a6989bfc90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/26] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 03092c6acb66..500f8cf1e589 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4217,3 +4217,8 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 2a042f945c71f2b3009f0343e991e9c4f816c40d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/26] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 500f8cf1e589..463ccdb3fa5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 97590f13952fd18e270be3f9dc371335e1aca2ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/26] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index 463ccdb3fa5b..cac241715eb5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 3ac39e8730971baeee961be61d6fe58a57390538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/26] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cac241715eb5..2015f8215a98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bd93d09771be..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=5
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From dd54f2aed071ae0c1bc79bee52ba75ef3042714e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/26] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   2 +-
 2 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index db46dd8708cb..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -3,7 +3,7 @@ pkgname=Field3D
 version=1.7.3
 revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 4eda9563619382ceff7005c3c5c4647b44e23ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/26] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From a127a2081d988e9f528bc509b14f6dd5e2b5e5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/26] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/cereal.patch      | 72 ++++++++++++++++++
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cereal.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal.patch b/srcpkgs/PrusaSlicer/patches/cereal.patch
new file mode 100644
index 000000000000..0c168bac14a5
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cereal.patch
@@ -0,0 +1,72 @@
+From d8ac66558c3e0dc758f963d554850eaf378892a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 25 Dec 2022 18:44:02 +0000
+Subject: [PATCH]  Use namespaces to link against libcereal
+
+---
+ CMakeLists.txt               | 6 ++++++
+ src/CMakeLists.txt           | 3 ++-
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt    | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01bb73..4153e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -474,6 +474,12 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e89e82..373c301 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,8 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
++
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 99d010d..058f1b2 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    libcereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 34cc980..331fdc4 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+-- 
+2.39.0
+
diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..3f961069446e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From cc479a0f96d6b6b3f3e4d355ccbc5f0fb412cb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 13/26] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+

From a7b4335a4f6bd68eb8cebecd9e2a0d0fc52ea637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 14/26] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From c409e349772f0915b3a3e8602c12d2aeee00aad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 15/26] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From 9c5cdb1a7f96a6fe3c7b8100052ad16026f8e769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 16/26] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From 621ddc14eafe15242e217fbf52a0dd0a6bdc52c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 17/26] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 41a95db0a8fdeea6507b85e17601f38c1fe62ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 18/26] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 5652e5a21b8f126906e2f66dc0893bfb994ed894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 19/26]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 3585bacd43988eca3613e2dee48e4670dbd324a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 20/26] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 5850549fb2b22a139ed95ed750f3f7263e892fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 21/26] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index abfcde28f7db..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -5,7 +5,7 @@ revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 53fbf5a2af609e0ea08a4808f4091eb44b7cbcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 22/26] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From cdf3ee84551e6afb0b01fd413454fbc1398918c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 23/26] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From e8c0f21bd6c3354722297f4740e79dc485415879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 24/26] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 086e1ed7816c232d733aee5f93215d1475293b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 25/26] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From d1b6127c5d5a82216892f9ee50f9af4c28532449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 26/26] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (44 preceding siblings ...)
  2023-01-07 14:22 ` motorto
@ 2023-01-07 14:27 ` motorto
  2023-01-09 12:07 ` Johnnynator
                   ` (4 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2023-01-07 14:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- darktable
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 74259 bytes --]

From 046494778d261b414833e2cde692c476d685c0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  4 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 6 files changed, 77 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index f4f5acece3fa..86c07a24ed18 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1696,10 +1696,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
 libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"

From 5565b72ef64de9467d8b2ac021d3acd87585d908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 86c07a24ed18..d6f48876e031 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4215,3 +4215,4 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 124a94a1978841df3b8cd3aaa71ab45ee543a3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d6f48876e031..fe5f134e3702 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3895,7 +3895,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From b8a1352e546eff18970aa468887a54ab5025e603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From f027c93840275d96793b03dc65534de19b729ae5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index fe5f134e3702..03092c6acb66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2236,6 +2236,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 65bf56867ee5ef6a083a9ca79f524a6989bfc90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 03092c6acb66..500f8cf1e589 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4217,3 +4217,8 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From 2a042f945c71f2b3009f0343e991e9c4f816c40d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 500f8cf1e589..463ccdb3fa5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 97590f13952fd18e270be3f9dc371335e1aca2ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index 463ccdb3fa5b..cac241715eb5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,7 +2235,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From 3ac39e8730971baeee961be61d6fe58a57390538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cac241715eb5..2015f8215a98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,8 +2233,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bd93d09771be..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=5
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From dd54f2aed071ae0c1bc79bee52ba75ef3042714e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   2 +-
 2 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index db46dd8708cb..3b0926dfa35d 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -3,7 +3,7 @@ pkgname=Field3D
 version=1.7.3
 revision=4
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 4eda9563619382ceff7005c3c5c4647b44e23ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From a127a2081d988e9f528bc509b14f6dd5e2b5e5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 srcpkgs/PrusaSlicer/patches/cereal.patch      | 72 ++++++++++++++++++
 .../patches/prusa-slicer-openexr3.patch       | 76 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cereal.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal.patch b/srcpkgs/PrusaSlicer/patches/cereal.patch
new file mode 100644
index 000000000000..0c168bac14a5
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cereal.patch
@@ -0,0 +1,72 @@
+From d8ac66558c3e0dc758f963d554850eaf378892a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
+Date: Sun, 25 Dec 2022 18:44:02 +0000
+Subject: [PATCH]  Use namespaces to link against libcereal
+
+---
+ CMakeLists.txt               | 6 ++++++
+ src/CMakeLists.txt           | 3 ++-
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt    | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a01bb73..4153e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -474,6 +474,12 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e89e82..373c301 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,8 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
++
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 99d010d..058f1b2 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -337,7 +337,7 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    libcereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 34cc980..331fdc4 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+-- 
+2.39.0
+
diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..3f961069446e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From fe064507738d84b43f1e2f7985ac9274f36249ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:26 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index e15d810c8929..e80446967366 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=3
+revision=4
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 6c9d4c73c4b89de8bc46d67b812b306c07ff9f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+

From c85ad6b2a519a14b9b8cdc4a60308b95b3e3c24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 192d0ac5bbe654bf7d6792cb864298efcdd9bb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From cf9c52ab4e2d4df49ea26532749c93143bf92a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 01b8f0b22d0f..2177b3c40d49 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=2
+revision=3
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From d9b6a4976919183de5249d1ab3a254808869fab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From c1c21f5595b1c165c4f95ea5242d7accd2ff41f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From e01f8ed5e7523b3d5d6b7bdec14be877ac1b07f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From 4f92f145a044df8945d8a81e14a4217bba75d5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From da7e738f838475c5a36441b094c086d0ec464b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 99d887185525a29a8c464c277b29772efbc6ced6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index abfcde28f7db..f7befe1e6fdf 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -5,7 +5,7 @@ revision=4
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 84c3813255ec0b1446a8ca923660a42f194a8f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 09bf9161aee6c1447cdb4fa4b4beb8e1d5c94695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From a86ed6bc06d8f73828a5906b97c1000f8c79a4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 4381cd77fdcaea569209c860cc583a6f769878c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From bd7654b3d58c416d03ab99a5072e13febc84e4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (45 preceding siblings ...)
  2023-01-07 14:27 ` motorto
@ 2023-01-09 12:07 ` Johnnynator
  2023-01-09 12:07 ` Johnnynator
                   ` (3 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2023-01-09 12:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- darktable
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 84227 bytes --]

From 4f990ae6a4a7405ecdcac83db05d756342a8a8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  5 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 srcpkgs/removed-packages/template             |  4 ++-
 7 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 349c183cdb38..3698004fcb00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1696,11 +1696,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a6a9e09bca86..2b0812b0ae67 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230102
+version=0.1.20230109
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -242,6 +242,8 @@ replaces="
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
  icecat<=78.6.1_1
+ ilmbase<=2.4.2_2
+ ilmbase-devel<=2.4.2_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 3857eb4102cf7b18124c53470ee300ca0474d9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 3698004fcb00..db220bd173d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4215,3 +4215,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8fd9348c80b5c25b85fc3713cac2dd0fd65aa233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db220bd173d5..032eefa2b7a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 5ea1feaa0c3e8ed6ce2645e8d604cca98db9ca1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 4accc1948d30cd89e11985cf342da9780345d0fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 032eefa2b7a3..54c2d2e74234 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 342a02795a8162a64863dd4af91b40a72eb3ed3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 54c2d2e74234..71ddd09f3458 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4217,3 +4217,8 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From c87a29854fcab4492399487be13c2480b28473d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 71ddd09f3458..3a7a0fd043bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 791e12917d943a6fd9e434b08027b720d7d4af01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index 3a7a0fd043bc..f5ed53fc343a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,7 +2234,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From ae298e05e8bcd7725d8cc0bf1a1074a6f0d52b29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f5ed53fc343a..e42350c63bed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,8 +2232,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bd93d09771be..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=5
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From f4a897b40e9999253f4e55387fefe49fbb50a0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index db46dd8708cb..f8abd1333056 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=4
+revision=5
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From d7cf53dc9c89926c026642567a0b7149a6ec7caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From f249d184d3a3d6b3662a1925ed2834d7316786eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       |  76 ++++++
 .../patches/system-boost-nowide.nop           | 229 ------------------
 srcpkgs/PrusaSlicer/template                  |   4 +-
 3 files changed, 78 insertions(+), 231 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop b/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop
deleted file mode 100644
index a396684dc0ee..000000000000
--- a/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop
+++ /dev/null
@@ -1,229 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -326,7 +326,7 @@ endif()
- # boost::process was introduced first in version 1.64.0,
- # boost::beast::detail::base64 was introduced first in version 1.66.0
- set(MINIMUM_BOOST_VERSION "1.66.0")
--set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
-+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
- find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
- 
- add_library(boost_libs INTERFACE)
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,8 +4,6 @@ project(PrusaSlicer-native)
- add_subdirectory(build-utils)
- add_subdirectory(admesh)
- add_subdirectory(avrdude)
--# boost/nowide
--add_subdirectory(boost)
- add_subdirectory(clipper)
- add_subdirectory(miniz)
- add_subdirectory(glu-libtess)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -341,7 +341,6 @@ target_link_libraries(libslic3r
-     miniz
-     boost_libs
-     clipper
--    nowide
-     ${EXPAT_LIBRARIES}
-     glu-libtess
-     qhull
---- a/src/PrusaSlicer.cpp
-+++ b/src/PrusaSlicer.cpp
-@@ -25,9 +25,9 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/args.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/iostream.hpp>
--#include <boost/nowide/integration/filesystem.hpp>
-+#include <boost/nowide/filesystem.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
- 
- #include "unix/fhs.hpp"  // Generated by CMake from ../platform/unix/fhs.hpp.in
---- a/src/libslic3r/pchheader.hpp
-+++ b/src/libslic3r/pchheader.hpp
-@@ -81,12 +81,12 @@
- #include <boost/log/expressions.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/multi_array.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
--#include <boost/nowide/integration/filesystem.hpp>
-+#include <boost/nowide/filesystem.hpp>
- #include <boost/nowide/iostream.hpp>
- 
- // boost/property_tree/json_parser/detail/parser.hpp includes boost/bind.hpp, which is deprecated.
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -12,7 +12,7 @@
- 
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/property_tree/ptree_fwd.hpp>
---- a/src/libslic3r/Config.cpp
-+++ b/src/libslic3r/Config.cpp
-@@ -16,7 +16,7 @@
- #include <boost/config.hpp>
- #include <boost/foreach.hpp>
- #include <boost/lexical_cast.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/iostream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/libslic3r/GCode/PostProcessor.cpp
-+++ b/src/libslic3r/GCode/PostProcessor.cpp
-@@ -9,7 +9,7 @@
- #include <boost/format.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/convert.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- 
- #ifdef WIN32
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -30,7 +30,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- 
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/src/libslic3r/PresetBundle.cpp
-+++ b/src/libslic3r/PresetBundle.cpp
-@@ -14,7 +14,7 @@
- #include <boost/algorithm/clamp.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- 
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/pchheader.hpp
-+++ b/src/slic3r/pchheader.hpp
-@@ -73,7 +73,7 @@
- #include <boost/locale.hpp>
- #include <boost/locale/encoding_utf.hpp>
- #include <boost/log/trivial.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/src/slic3r/GUI/Plater.cpp
-+++ b/src/slic3r/GUI/Plater.cpp
-@@ -1339,7 +1339,7 @@ void Sidebar::update_sliced_info_sizer()
-             wxString t_est = std::isnan(ps.estimated_print_time) ? "N/A" : get_time_dhms(float(ps.estimated_print_time));
-             p->sliced_info->SetTextAndShow(siEstimatedTime, t_est, _L("Estimated printing time") + ":");
- 
--            p->plater->get_notification_manager()->set_slicing_complete_print_time(_utf8("Estimated printing time: ") + boost::nowide::narrow(t_est), p->plater->is_sidebar_collapsed());
-+            p->plater->get_notification_manager()->set_slicing_complete_print_time(static_cast<const char*>((_utf8("Estimated printing time: ") + t_est.utf8_str()).utf8_str()), p->plater->is_sidebar_collapsed());
- 
-             // Hide non-SLA sliced info parameters
-             p->sliced_info->SetTextAndShow(siFilament_m, "N/A");
---- a/src/slic3r/GUI/GUI_ObjectList.cpp
-+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
-@@ -4153,7 +4153,7 @@ void ObjectList::fix_through_netfabb()
-     }
-     if (msg.IsEmpty())
-         msg = _L("Repairing was canceled");
--    plater->get_notification_manager()->push_notification(NotificationType::NetfabbFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, boost::nowide::narrow(msg));
-+    plater->get_notification_manager()->push_notification(NotificationType::NetfabbFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, static_cast<const char *>(msg.utf8_str()));
- }
- 
- void ObjectList::simplify()
---- a/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
-@@ -411,7 +411,7 @@ void PrintHostQueueDialog::on_progress(E
-         wxVariant nm, hst;
-         job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-         job_list->GetValue(hst, evt.job_id, COL_HOST);
--        wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()), evt.progress / 100.f);
-+        wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString(), evt.progress / 100.f);
-     }
- }
- 
-@@ -432,7 +432,7 @@ void PrintHostQueueDialog::on_error(Even
-     wxVariant nm, hst;
-     job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-     job_list->GetValue(hst, evt.job_id, COL_HOST);
--    wxGetApp().notification_manager()->upload_job_notification_show_error(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()));
-+    wxGetApp().notification_manager()->upload_job_notification_show_error(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString());
- }
- 
- void PrintHostQueueDialog::on_cancel(Event &evt)
-@@ -447,7 +447,7 @@ void PrintHostQueueDialog::on_cancel(Eve
-     wxVariant nm, hst;
-     job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-     job_list->GetValue(hst, evt.job_id, COL_HOST);
--    wxGetApp().notification_manager()->upload_job_notification_show_canceled(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()));
-+    wxGetApp().notification_manager()->upload_job_notification_show_canceled(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString());
- }
- 
- void PrintHostQueueDialog::get_active_jobs(std::vector<std::pair<std::string, std::string>>& ret)
---- a/src/slic3r/GUI/Search.cpp
-+++ b/src/slic3r/GUI/Search.cpp
-@@ -239,7 +239,7 @@ bool OptionsSearcher::search(const std::
-         const Option &opt = options[i];
-         if (full_list) {
-             std::string label = into_u8(get_label(opt));
--            found.emplace_back(FoundOption{ label, label, boost::nowide::narrow(get_tooltip(opt)), i, 0 });
-+            found.emplace_back(FoundOption{ label, label, get_tooltip(opt).ToStdString(), i, 0 });
-             continue;
-         }
- 
-@@ -276,7 +276,7 @@ bool OptionsSearcher::search(const std::
-             boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerStart)));
-             boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerEnd)));
- #endif
--	        found.emplace_back(FoundOption{ label_plain, label_u8, boost::nowide::narrow(get_tooltip(opt)), i, score });
-+	        found.emplace_back(FoundOption{ label_plain, label_u8, get_tooltip(opt).ToStdString(), i, score });
-         }
-     }
- 
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -118,7 +118,7 @@ void resolve_path_from_var(const std::st
-     wxString wxdirs;
-     if (! wxGetEnv(boost::nowide::widen(var), &wxdirs) || wxdirs.empty() )
-         return;
--    std::string dirs = boost::nowide::narrow(wxdirs);
-+    std::string dirs = wxdirs.ToStdString();
-     for (size_t i = dirs.find(':'); i != std::string::npos; i = dirs.find(':'))
-     {
-         paths.push_back(dirs.substr(0, i));
-@@ -303,7 +303,7 @@ void DesktopIntegrationDialog::perform_d
-             // if all failed - try creating default home folder
-             if (i == target_candidates.size() - 1) {
-                 // create $HOME/.local/share
--                create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/icons" + icon_theme_dirs);
-+                create_path(wxFileName::GetHomeDir().ToStdString(), ".local/share/icons" + icon_theme_dirs);
-                 // copy icon
-                 target_dir_icons = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
-                 std::string icon_path = GUI::format("%1%/icons/PrusaSlicer.png",resources_dir());
-@@ -355,7 +355,7 @@ void DesktopIntegrationDialog::perform_d
-             // if all failed - try creating default home folder
-             if (i == target_candidates.size() - 1) {
-                 // create $HOME/.local/share
--                create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/applications");
-+                create_path(wxFileName::GetHomeDir().ToStdString(), ".local/share/applications");
-                 // create desktop file
-                 target_dir_desktop = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
-                 std::string path = GUI::format("%1%/applications/PrusaSlicer%2%.desktop", target_dir_desktop, version_suffix);
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..676680fb4297 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 51f929f712c075d02998b1f6a27077818d7eacd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:26 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index e15d810c8929..e80446967366 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=3
+revision=4
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 8d891ba17f984a31dbc00e2330679f597712b995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9289bab2d6cf..daf927aeb06a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=10
+revision=11
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From e2347378889a2e9e59eeb8a32f31cd1c059a9aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 764d459eedb472dd48ca279f5eccb44eaecf1b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From dd306466993d77dd9e2057b27f09d4d725d54eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 01b8f0b22d0f..2177b3c40d49 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=2
+revision=3
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 90b50c789952850eb4b64ad8810c02122846d013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From e53e90e8601c53322266bfa1f642ff1cb625edab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From dab99b40ee601eb4c3ea0e0876be1f05bab02e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From e5f4b4464197aca2afc86a9e893a4900e4cb2429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 57e2749d0c65c248f9b3fd98e53d387d9e644ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 9095cd61fc93e8b225c9a25dc498b5b486ebdbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index abfcde28f7db..d8ef5b4496b9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dc24f6e8748e1a268703837bbca9c5ff3881692a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 3314d88ba18f10ff407b62d0620ac511dd5d5f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From b32943358e375dc60ae6f8334921939026274bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From c8546b137a22d472ce6e72ba960f265a84d8758a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  5 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..a97a285df08f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -6,13 +6,14 @@ build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From 179246a3ddc51e6dea63caeaae215af6ebae4044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (46 preceding siblings ...)
  2023-01-09 12:07 ` Johnnynator
@ 2023-01-09 12:07 ` Johnnynator
  2023-01-09 12:45 ` [PR PATCH] [Updated] " Johnnynator
                   ` (2 subsequent siblings)
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2023-01-09 12:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1375529473

Comment:
I (force) pushed some changes to your branch:

- Readded some revbumps that got lost while rebasing
- removed cereal.patch from PrusaSlicer (was already added in the boost revbump with a different name)
- Properly removed ilmbase (there was still a reference in common/shlibs before)

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Updated] openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (47 preceding siblings ...)
  2023-01-09 12:07 ` Johnnynator
@ 2023-01-09 12:45 ` Johnnynator
  2023-01-09 14:31 ` [PR PATCH] [Merged]: " Johnnynator
  2023-01-09 15:39 ` motorto
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2023-01-09 12:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/motorto/void-packages imath
https://github.com/void-linux/void-packages/pull/39852

openexr3.0 update
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- darktable
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

A patch file from https://github.com/void-linux/void-packages/pull/39852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-39852.patch --]
[-- Type: text/x-diff, Size: 84313 bytes --]

From 4f990ae6a4a7405ecdcac83db05d756342a8a8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:19:57 +0000
Subject: [PATCH 01/28] ilmbase: remove package

IlmBase has been superceded by Imath for OpenEXR 3.0
---
 common/shlibs                                 |  5 ---
 srcpkgs/ilmbase-devel                         |  1 -
 srcpkgs/ilmbase/patches/musl-_fpstate.patch   | 21 -----------
 .../ilmbase/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/ilmbase/template                      | 35 -------------------
 srcpkgs/ilmbase/update                        |  1 -
 srcpkgs/removed-packages/template             |  4 ++-
 7 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 120000 srcpkgs/ilmbase-devel
 delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
 delete mode 100644 srcpkgs/ilmbase/template
 delete mode 100644 srcpkgs/ilmbase/update

diff --git a/common/shlibs b/common/shlibs
index 349c183cdb38..3698004fcb00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1696,11 +1696,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
 libtcmalloc_debug.so.4 gperftools-2.1.90_1
 libprofiler.so.0 gperftools-2.1.90_1
 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
 libIlmImf-2_4.so.24 libopenexr-2.4.0_1
 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in	2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index f5bb0be3fa13..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i Half/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
-post_install() {
-	vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a6a9e09bca86..2b0812b0ae67 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20230102
+version=0.1.20230109
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -242,6 +242,8 @@ replaces="
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
  icecat<=78.6.1_1
+ ilmbase<=2.4.2_2
+ ilmbase-devel<=2.4.2_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 3857eb4102cf7b18124c53470ee300ca0474d9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 02/28] New package: imath-3.1.5.

---
 common/shlibs          |  1 +
 srcpkgs/imath-devel    |  1 +
 srcpkgs/imath-python3  |  1 +
 srcpkgs/imath/template | 45 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/imath-devel
 create mode 120000 srcpkgs/imath-python3
 create mode 100644 srcpkgs/imath/template

diff --git a/common/shlibs b/common/shlibs
index 3698004fcb00..db220bd173d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4215,3 +4215,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
+libImath-3_1.so.29 imath-3.1.5_1
diff --git a/srcpkgs/imath-devel b/srcpkgs/imath-devel
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-devel
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath-python3 b/srcpkgs/imath-python3
new file mode 120000
index 000000000000..aa5ac0a078d9
--- /dev/null
+++ b/srcpkgs/imath-python3
@@ -0,0 +1 @@
+imath
\ No newline at end of file
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
new file mode 100644
index 000000000000..0123217d7aeb
--- /dev/null
+++ b/srcpkgs/imath/template
@@ -0,0 +1,45 @@
+# Template file for 'imath'
+pkgname=imath
+version=3.1.5
+revision=1
+build_style=cmake
+configure_args="-DPYTHON=ON"
+hostmakedepends="python3-numpy"
+makedepends="boost-devel python3-devel python3-numpy"
+short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_MACHINE" = "i686" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151
+fi
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+imath-python3_package() {
+	short_desc+=" - Python module"
+	pkg_install() {
+		vmove "usr/lib/libPyImath_Python*"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
+	}
+}
+
+imath-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libImath*.so"
+	}
+}

From 8fd9348c80b5c25b85fc3713cac2dd0fd65aa233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:49:44 +0000
Subject: [PATCH 03/28] alembic: update to 1.8.3; adopt.

---
 common/shlibs            | 2 +-
 srcpkgs/alembic/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db220bd173d5..032eefa2b7a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
 libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index a25ce7201ba8..b03dd81bdbbd 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="Open framework for storing and sharing scene data"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 5ea1feaa0c3e8ed6ce2645e8d604cca98db9ca1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 16 Oct 2022 17:56:42 +0200
Subject: [PATCH 04/28] New package: robin-map-1.0.1

---
 srcpkgs/robin-map/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/robin-map/template

diff --git a/srcpkgs/robin-map/template b/srcpkgs/robin-map/template
new file mode 100644
index 000000000000..0c25470d5362
--- /dev/null
+++ b/srcpkgs/robin-map/template
@@ -0,0 +1,15 @@
+# Template file for 'robin-map'
+pkgname=robin-map
+version=1.0.1
+revision=1
+build_style=cmake
+short_desc="Fast hash map and hash set using robin hood hashing"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/Tessil/robin-map"
+distfiles="https://github.com/Tessil/robin-map/archive/refs/tags/v${version}.tar.gz"
+checksum=b2ffdb623727cea852a66bddcb7fa6d938538a82b40e48294bb581fe086ef005
+
+post_install() {
+	vlicense LICENSE
+}

From 4accc1948d30cd89e11985cf342da9780345d0fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 20:34:32 +0200
Subject: [PATCH 05/28] New package: pystring-1.1.3

---
 common/shlibs                        |  1 +
 srcpkgs/pystring-devel               |  1 +
 srcpkgs/pystring/patches/meson.patch | 12 ++++++++++++
 srcpkgs/pystring/template            | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/pystring-devel
 create mode 100644 srcpkgs/pystring/patches/meson.patch
 create mode 100644 srcpkgs/pystring/template

diff --git a/common/shlibs b/common/shlibs
index 032eefa2b7a3..54c2d2e74234 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
+libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
 libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/pystring-devel b/srcpkgs/pystring-devel
new file mode 120000
index 000000000000..24f83d734bf2
--- /dev/null
+++ b/srcpkgs/pystring-devel
@@ -0,0 +1 @@
+pystring
\ No newline at end of file
diff --git a/srcpkgs/pystring/patches/meson.patch b/srcpkgs/pystring/patches/meson.patch
new file mode 100644
index 000000000000..6ca8729989b6
--- /dev/null
+++ b/srcpkgs/pystring/patches/meson.patch
@@ -0,0 +1,12 @@
+--- /dev/null	2022-09-11 10:25:08.762524599 +0200
++++ pystring-1.1.3/meson.build	2022-09-11 12:48:33.304524690 +0200
+@@ -0,0 +1,9 @@
++project('pystring', 'cpp')
++pkg = import('pkgconfig')
++lib = library('pystring',
++              'pystring.cpp',
++              version: '1.1.3',
++              soversion: '1',
++              install : true)
++pkg.generate(lib)
++install_headers('pystring.h', subdir: 'pystring')
diff --git a/srcpkgs/pystring/template b/srcpkgs/pystring/template
new file mode 100644
index 000000000000..0aa1d0ba709a
--- /dev/null
+++ b/srcpkgs/pystring/template
@@ -0,0 +1,25 @@
+# Template file for 'pystring'
+pkgname=pystring
+version=1.1.3
+revision=1
+build_style=meson
+short_desc="C++ functions matching interface/behavior of python strings"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-2-Clause"
+homepage="https://github.com/imageworks/pystring"
+distfiles="https://github.com/imageworks/pystring/archive/refs/tags/v${version}.tar.gz"
+checksum=358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9
+
+post_install() {
+	vlicense LICENSE
+}
+
+pystring-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 342a02795a8162a64863dd4af91b40a72eb3ed3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 20:14:40 +0100
Subject: [PATCH 06/28] openexr: update to 3.1.5; adopt.

---
 common/shlibs                                 |  5 +++
 srcpkgs/openexr/patches/musl-_fpstate.patch   | 21 ------------
 .../openexr/patches/pkgconfig-prefix.patch    | 15 --------
 srcpkgs/openexr/template                      | 34 +++++++------------
 4 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
 delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch

diff --git a/common/shlibs b/common/shlibs
index 54c2d2e74234..71ddd09f3458 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4217,3 +4217,8 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp	2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in	2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in	2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..9a37d32f1254 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,28 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
+makedepends="zlib-devel imath-devel"
 short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.openexr.com/"
+changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md"
 distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i IlmBase/Half/CMakeLists.txt \
-			IlmBase/ImathTest/CMakeLists.txt \
-			OpenEXR/IlmImf/CMakeLists.txt \
-			-e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
-	fi
-}
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]
+then
+	make_check=no # Test Fails in i868
+	# See upstream:
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/876
+fi
 
 post_install() {
-	local d f
-
 	vlicense LICENSE.md
-
-	# Remove files which are already in ilmbase{,-devel}
-	for pkg in ilmbase ilmbase-devel; do
-		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
-			rm -f "${DESTDIR}/$f"
-		done
-	done
 }
 
 libopenexr_package() {

From c87a29854fcab4492399487be13c2480b28473d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Sep 2022 20:20:48 +0200
Subject: [PATCH 07/28] gmic: update to 3.1.6.

---
 common/shlibs                                 |  4 +-
 srcpkgs/gmic/patches/01-includedir.patch      | 44 -------------------
 srcpkgs/gmic/patches/02-opt-flags.patch       | 28 ------------
 .../gmic/patches/04-no-krita-and-order.patch  | 39 ----------------
 srcpkgs/gmic/template                         | 12 ++---
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch
 delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
 delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch

diff --git a/common/shlibs b/common/shlibs
index 71ddd09f3458..3a7a0fd043bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1
 libgimpmath-2.0.so.0 libgimp-2.10.0_1
 libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
-libgmic.so.2 gmic-2.1.8_1
-libcgmic.so.2 gmic-2.1.8_1
+libgmic.so.3 gmic-3.1.6_1
+libcgmic.so.3 gmic-3.1.6_1
 libexiv2.so.27 exiv2-0.27_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
deleted file mode 100644
index 2cf9031443e5..000000000000
--- a/srcpkgs/gmic/patches/01-includedir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
- NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
- 
- # Minimal set of flags mandatory to compile G'MIC.
--MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
-+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
- MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
- 
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
-+MANDATORY_LIBS +=
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- MANDATORY_LIBS += -lm
-@@ -250,7 +250,7 @@ endif
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
--XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
--MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
-+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
-+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
- OPENEXR_LIBS = -lIlmImf -lHalf
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
deleted file mode 100644
index 0d3a5894e589..000000000000
--- a/srcpkgs/gmic/patches/02-opt-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -192,9 +192,9 @@ endif
- 
- # Enable optimizations for 'cli'.
- FLTO = -flto
--OPT_CLI_CFLAGS = -Ofast
-+OPT_CLI_CFLAGS =
- ifdef IS_GCC
--OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
-+OPT_CLI_CFLAGS = $(FLTO)
- OPT_CLI_LIBS = $(FLTO)
- endif
- ifdef icpc
-Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
-===================================================================
---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
-+++ gmic-2.9.9/gmic-qt/gmic_qt.pro
-@@ -445,7 +445,6 @@ translations/zh_tw.ts
- 
- # PRE_TARGETDEPS +=
- 
--QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
- QMAKE_LFLAGS_RELEASE += -s
- QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
- 
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
deleted file mode 100644
index 18ce17a97a7b..000000000000
--- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: gmic-2.9.9/src/Makefile
-===================================================================
---- gmic-2.9.9.orig/src/Makefile
-+++ gmic-2.9.9/src/Makefile
-@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
- #-------------------------------
- # Define main Makefile entries.
- #-------------------------------
- 
- # Multi-targets
- #--------------
--all:
-+all: cli lib gimp gmic_qt libc zart
-+
-+gmic_qt: gimp
-+
-+gimp zart: cli lib libc
-+
-+cli lib libc: all-banner
-+
-+all-banner:
- 	@echo "**"
- ifeq ($(OS),Unix)
- 	@echo "** Start building G'MIC with default Unix configuration."
- else
- ifeq ($(OS),Darwin)
- 	@echo "** Start building G'MIC with default MacOSX configuration."
- else
- 	@echo "** Start building G'MIC with default Windows configuration."
- endif
- endif
- 	@echo "**"
--	$(MAKE) cli lib gimp krita gmic_qt libc zart
- 
- native:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
- 
- # CLI (standard)
- #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index fce3b7639dfe..f591b833295b 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,8 +1,8 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=2.9.9
-revision=3
-_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+version=3.1.6
+revision=1
+_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C"
 homepage="http://gmic.eu/"
 distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
  https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
-checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
- eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-# disable_parallel_build="yes"
+checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
+ 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
+disable_parallel_build="yes"
 
 post_extract() {
 	mv gmic-${version}/* .

From 791e12917d943a6fd9e434b08027b720d7d4af01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:46:41 +0200
Subject: [PATCH 08/28] opencolorio: update to 2.1.2.

---
 common/shlibs                                 |  2 +-
 .../opencolorio/patches/disable_werror.patch  | 30 ------
 .../patches/fix-cmake-files-location.patch    | 99 -------------------
 srcpkgs/opencolorio/patches/musl.patch        | 13 +++
 srcpkgs/opencolorio/patches/strlen.patch      | 13 +++
 srcpkgs/opencolorio/template                  | 25 ++---
 6 files changed, 41 insertions(+), 141 deletions(-)
 delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
 delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
 create mode 100644 srcpkgs/opencolorio/patches/musl.patch
 create mode 100644 srcpkgs/opencolorio/patches/strlen.patch

diff --git a/common/shlibs b/common/shlibs
index 3a7a0fd043bc..f5ed53fc343a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,7 +2234,7 @@ libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 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
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
- 
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
-     message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                     | 9 +++++----
- docs/CMakeLists.txt                | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     
-     ## targets libraries + associated definitions
-     if(NOT TARGET OpenColorIO)
--        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
-         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
-             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
-             set(OpenColorIO_LIBRARY         OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..db9df159f627
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,13 @@
+--- a/src/utils/NumberUtils.h	2022-06-02 02:35:53.000000000 +0200
++++ -	2022-08-21 21:37:36.557414889 +0200
+@@ -10,6 +10,10 @@
+ #define really_inline inline __attribute__((always_inline))
+ #endif
+ 
++#if !defined(__GLIBC__)
++#define strtol_l(ptr, end, base, l) strtol(ptr, end, base)
++#endif
++
+ #include <cstdlib>
+ #include <locale>
+ #include <system_error>
diff --git a/srcpkgs/opencolorio/patches/strlen.patch b/srcpkgs/opencolorio/patches/strlen.patch
new file mode 100644
index 000000000000..0bdacd1890e7
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/strlen.patch
@@ -0,0 +1,13 @@
+Index: OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+===================================================================
+--- OpenColorIO-2.1.1.orig/src/OpenColorIO/FileRules.cpp
++++ OpenColorIO-2.1.1/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index cfa9b33698f3..8b9505ca9ae4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,25 +1,28 @@
 # Template file for 'opencolorio'
 pkgname=opencolorio
-version=1.1.1
+version=2.1.2
 revision=1
 build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON
+ -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr
+ -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11"
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) ;;
+	x86_64*) ;;
 	 *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
 esac
-make_cmd=make
-hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+hostmakedepends="pkg-config git python3"
+makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
+ libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
+ python3-pybind11"
+short_desc="Complete color management solution"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="custom:openimageio"
 homepage="http://opencolorio.org"
 changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
+make_check=no #(GPU tests): failed to open display ''
 
 post_install() {
 	vlicense LICENSE

From ae298e05e8bcd7725d8cc0bf1a1074a6f0d52b29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Aug 2022 21:31:41 +0200
Subject: [PATCH 09/28] openimageio: update to 2.3.18.0.

---
 common/shlibs                |  4 ++--
 srcpkgs/openimageio/template | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f5ed53fc343a..e42350c63bed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2232,8 +2232,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.18.0_1
 libOpenColorIO.so.2.1 opencolorio-2.1.2_1
 libpystring.so.1 pystring-1.1.3_1
 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bd93d09771be..cc9d7a33984e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,24 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=2.2.15.1
-revision=5
+version=2.3.18.0
+revision=1
 build_style=cmake
+build_helper=qemu
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
+ -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14
+ -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF"
 hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
  ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ robin-map fmt-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz"
+checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a
 # Runs checks even for features we disabled.
 make_check=no
 
@@ -29,10 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
 pre_build() {
 	local f
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -57,7 +55,6 @@ openimageio-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From f4a897b40e9999253f4e55387fefe49fbb50a0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Mon, 10 Oct 2022 22:40:16 +0100
Subject: [PATCH 10/28] Field3D: revbump for openexr3

---
 srcpkgs/Field3D/patches/Field3D-openexr.patch | 244 ++++++++++++++++++
 srcpkgs/Field3D/template                      |   4 +-
 2 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/Field3D/patches/Field3D-openexr.patch

diff --git a/srcpkgs/Field3D/patches/Field3D-openexr.patch b/srcpkgs/Field3D/patches/Field3D-openexr.patch
new file mode 100644
index 000000000000..02e96fd65fa1
--- /dev/null
+++ b/srcpkgs/Field3D/patches/Field3D-openexr.patch
@@ -0,0 +1,244 @@
+Index: Field3D-1.7.3/export/StdMathLib.h
+===================================================================
+--- Field3D-1.7.3.orig/export/StdMathLib.h
++++ Field3D-1.7.3/export/StdMathLib.h
+@@ -38,18 +38,41 @@
+ #ifndef _INCLUDED_Field3D_StdMathLib_H_
+ #define _INCLUDED_Field3D_StdMathLib_H_
+ 
+-#include <OpenEXR/ImathBox.h> 
+-#include <OpenEXR/ImathBoxAlgo.h>
+-#include <OpenEXR/ImathColor.h>
+-#include <OpenEXR/ImathHalfLimits.h>
+-#include <OpenEXR/ImathMatrix.h>
+-#include <OpenEXR/ImathMatrixAlgo.h>
+-#include <OpenEXR/ImathPlane.h>
+-#include <OpenEXR/ImathRandom.h> 
+-#include <OpenEXR/ImathRoots.h>
+-#include <OpenEXR/ImathVec.h>
+-#include <OpenEXR/half.h> 
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
+ 
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathBox.h>
++#   include <Imath/ImathBoxAlgo.h>
++#   include <Imath/ImathColor.h>
++#   include <Imath/ImathMatrix.h>
++#   include <Imath/ImathMatrixAlgo.h>
++#   include <Imath/ImathPlane.h>
++#   include <Imath/ImathRandom.h>
++#   include <Imath/ImathRoots.h>
++#   include <Imath/ImathVec.h>
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathBox.h>
++#   include <OpenEXR/ImathBoxAlgo.h>
++#   include <OpenEXR/ImathColor.h>
++#   include <OpenEXR/ImathHalfLimits.h>
++#   include <OpenEXR/ImathMatrix.h>
++#   include <OpenEXR/ImathMatrixAlgo.h>
++#   include <OpenEXR/ImathPlane.h>
++#   include <OpenEXR/ImathRandom.h>
++#   include <OpenEXR/ImathRoots.h>
++#   include <OpenEXR/ImathVec.h>
++#   include <OpenEXR/half.h>
++#endif
+ //----------------------------------------------------------------------------//
+ 
+ #include "ns.h"
+Index: Field3D-1.7.3/export/Curve.h
+===================================================================
+--- Field3D-1.7.3.orig/export/Curve.h
++++ Field3D-1.7.3/export/Curve.h
+@@ -53,8 +53,25 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ 
+-#include <OpenEXR/ImathFun.h>
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFun.h>
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFun.h>
++#   include <OpenEXR/ImathMatrix.h>
++#endif
++
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/include/OgUtil.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgUtil.h
++++ Field3D-1.7.3/include/OgUtil.h
+@@ -10,7 +10,22 @@
+ #include <iostream>
+ #include <string>
+ 
+-#include <OpenEXR/ImathVec.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathVec.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathVec.h>
++#endif
+ 
+ #include "All.h"
+ #include "UtilFoundation.h"
+Index: Field3D-1.7.3/include/UtilFoundation.h
+===================================================================
+--- Field3D-1.7.3.orig/include/UtilFoundation.h
++++ Field3D-1.7.3/include/UtilFoundation.h
+@@ -68,7 +68,22 @@
+ 
+ #include <memory>
+ 
+-#include <half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ 
+ #include <iomanip>
+ #include <iostream>
+Index: Field3D-1.7.3/include/OgIAttribute.h
+===================================================================
+--- Field3D-1.7.3.orig/include/OgIAttribute.h
++++ Field3D-1.7.3/include/OgIAttribute.h
+@@ -9,7 +9,22 @@
+ 
+ #include "OgUtil.h"
+ 
+-#include <OpenEXR/ImathMatrix.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathMatrix.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathMatrix.h>
++#endif
+ 
+ //----------------------------------------------------------------------------//
+ 
+Index: Field3D-1.7.3/CMakeLists.txt
+===================================================================
+--- Field3D-1.7.3.orig/CMakeLists.txt
++++ Field3D-1.7.3/CMakeLists.txt
+@@ -49,7 +49,13 @@ FIND_PACKAGE (Boost COMPONENTS regex thr
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+ 
+-FIND_PACKAGE (ILMBase)
++# First, try to find just the right config files
++find_package(Imath CONFIG)
++if (NOT TARGET Imath::Imath)
++    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
++    find_package(IlmBase CONFIG)
++endif ()
++find_package(OpenEXR CONFIG)
+ 
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -146,9 +152,20 @@ IF ( CMAKE_HOST_UNIX )
+       LIST ( APPEND Field3D_Libraries_Shared
+              ${MPI_LIBRARIES} )
+   ENDIF ( MPI_FOUND )
+-  LIST ( APPEND Field3D_Libraries_Shared
+-    Iex Half IlmThread Imath
+-    pthread dl z )
++  if(TARGET Imath::Imath)
++	  list(APPEND Field3D_Libraries_Shared
++        # For OpenEXR/Imath 3.x:
++          $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++          $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++          $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++		  pthread
++		  dl
++		  z)
++  else()
++    LIST ( APPEND Field3D_Libraries_Shared
++        Iex Half IlmThread Imath
++        pthread dl z )
++  endif()
+   SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+   SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+         ${Boost_LIBRARIES} )
+Index: Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+===================================================================
+--- Field3D-1.7.3.orig/test/unit_tests/UnitTest.cpp
++++ Field3D-1.7.3/test/unit_tests/UnitTest.cpp
+@@ -44,7 +44,22 @@
+ #include <boost/thread/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <OpenEXR/ImathFrustum.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/ImathFrustum.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/ImathFrustum.h>
++#endif
+ 
+ #include "Field3D/DenseField.h"
+ #include "Field3D/EmptyField.h"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index db46dd8708cb..f8abd1333056 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,9 +1,9 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=4
+revision=5
 build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
+makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From d7cf53dc9c89926c026642567a0b7149a6ec7caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 27 Oct 2022 18:53:34 +0100
Subject: [PATCH 11/28] ImageMagick: revbump for openexr3

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index aca085702063..425d74a75c29 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 version=7.1.0.55
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From f249d184d3a3d6b3662a1925ed2834d7316786eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:33 +0000
Subject: [PATCH 12/28] PrusaSlicer: revbump for openexr3

---
 .../patches/prusa-slicer-openexr3.patch       |  76 ++++++
 .../patches/system-boost-nowide.nop           | 229 ------------------
 srcpkgs/PrusaSlicer/template                  |   4 +-
 3 files changed, 78 insertions(+), 231 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop

diff --git a/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
new file mode 100644
index 000000000000..9caf47f640c1
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/prusa-slicer-openexr3.patch
@@ -0,0 +1,76 @@
+diff -up PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3 PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake
+--- PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake.openexr3	2021-12-21 15:57:35.000000000 +0000
++++ PrusaSlicer-version_2.4.0/cmake/modules/FindOpenVDB.cmake	2022-02-11 19:27:12.105404186 +0000
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUI
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop b/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop
deleted file mode 100644
index a396684dc0ee..000000000000
--- a/srcpkgs/PrusaSlicer/patches/system-boost-nowide.nop
+++ /dev/null
@@ -1,229 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -326,7 +326,7 @@ endif()
- # boost::process was introduced first in version 1.64.0,
- # boost::beast::detail::base64 was introduced first in version 1.66.0
- set(MINIMUM_BOOST_VERSION "1.66.0")
--set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
-+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
- find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
- 
- add_library(boost_libs INTERFACE)
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,8 +4,6 @@ project(PrusaSlicer-native)
- add_subdirectory(build-utils)
- add_subdirectory(admesh)
- add_subdirectory(avrdude)
--# boost/nowide
--add_subdirectory(boost)
- add_subdirectory(clipper)
- add_subdirectory(miniz)
- add_subdirectory(glu-libtess)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -341,7 +341,6 @@ target_link_libraries(libslic3r
-     miniz
-     boost_libs
-     clipper
--    nowide
-     ${EXPAT_LIBRARIES}
-     glu-libtess
-     qhull
---- a/src/PrusaSlicer.cpp
-+++ b/src/PrusaSlicer.cpp
-@@ -25,9 +25,9 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/args.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/iostream.hpp>
--#include <boost/nowide/integration/filesystem.hpp>
-+#include <boost/nowide/filesystem.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
- 
- #include "unix/fhs.hpp"  // Generated by CMake from ../platform/unix/fhs.hpp.in
---- a/src/libslic3r/pchheader.hpp
-+++ b/src/libslic3r/pchheader.hpp
-@@ -81,12 +81,12 @@
- #include <boost/log/expressions.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/multi_array.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
--#include <boost/nowide/integration/filesystem.hpp>
-+#include <boost/nowide/filesystem.hpp>
- #include <boost/nowide/iostream.hpp>
- 
- // boost/property_tree/json_parser/detail/parser.hpp includes boost/bind.hpp, which is deprecated.
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -12,7 +12,7 @@
- 
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/property_tree/ptree_fwd.hpp>
---- a/src/libslic3r/Config.cpp
-+++ b/src/libslic3r/Config.cpp
-@@ -16,7 +16,7 @@
- #include <boost/config.hpp>
- #include <boost/foreach.hpp>
- #include <boost/lexical_cast.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/iostream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/libslic3r/GCode/PostProcessor.cpp
-+++ b/src/libslic3r/GCode/PostProcessor.cpp
-@@ -9,7 +9,7 @@
- #include <boost/format.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/convert.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/fstream.hpp>
- 
- #ifdef WIN32
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -30,7 +30,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- 
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/src/libslic3r/PresetBundle.cpp
-+++ b/src/libslic3r/PresetBundle.cpp
-@@ -14,7 +14,7 @@
- #include <boost/algorithm/clamp.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- 
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/pchheader.hpp
-+++ b/src/slic3r/pchheader.hpp
-@@ -73,7 +73,7 @@
- #include <boost/locale.hpp>
- #include <boost/locale/encoding_utf.hpp>
- #include <boost/log/trivial.hpp>
--#include <boost/nowide/cenv.hpp>
-+#include <boost/nowide/cstdlib.hpp>
- #include <boost/nowide/convert.hpp>
- #include <boost/nowide/cstdio.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/src/slic3r/GUI/Plater.cpp
-+++ b/src/slic3r/GUI/Plater.cpp
-@@ -1339,7 +1339,7 @@ void Sidebar::update_sliced_info_sizer()
-             wxString t_est = std::isnan(ps.estimated_print_time) ? "N/A" : get_time_dhms(float(ps.estimated_print_time));
-             p->sliced_info->SetTextAndShow(siEstimatedTime, t_est, _L("Estimated printing time") + ":");
- 
--            p->plater->get_notification_manager()->set_slicing_complete_print_time(_utf8("Estimated printing time: ") + boost::nowide::narrow(t_est), p->plater->is_sidebar_collapsed());
-+            p->plater->get_notification_manager()->set_slicing_complete_print_time(static_cast<const char*>((_utf8("Estimated printing time: ") + t_est.utf8_str()).utf8_str()), p->plater->is_sidebar_collapsed());
- 
-             // Hide non-SLA sliced info parameters
-             p->sliced_info->SetTextAndShow(siFilament_m, "N/A");
---- a/src/slic3r/GUI/GUI_ObjectList.cpp
-+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
-@@ -4153,7 +4153,7 @@ void ObjectList::fix_through_netfabb()
-     }
-     if (msg.IsEmpty())
-         msg = _L("Repairing was canceled");
--    plater->get_notification_manager()->push_notification(NotificationType::NetfabbFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, boost::nowide::narrow(msg));
-+    plater->get_notification_manager()->push_notification(NotificationType::NetfabbFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, static_cast<const char *>(msg.utf8_str()));
- }
- 
- void ObjectList::simplify()
---- a/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
-@@ -411,7 +411,7 @@ void PrintHostQueueDialog::on_progress(E
-         wxVariant nm, hst;
-         job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-         job_list->GetValue(hst, evt.job_id, COL_HOST);
--        wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()), evt.progress / 100.f);
-+        wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString(), evt.progress / 100.f);
-     }
- }
- 
-@@ -432,7 +432,7 @@ void PrintHostQueueDialog::on_error(Even
-     wxVariant nm, hst;
-     job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-     job_list->GetValue(hst, evt.job_id, COL_HOST);
--    wxGetApp().notification_manager()->upload_job_notification_show_error(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()));
-+    wxGetApp().notification_manager()->upload_job_notification_show_error(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString());
- }
- 
- void PrintHostQueueDialog::on_cancel(Event &evt)
-@@ -447,7 +447,7 @@ void PrintHostQueueDialog::on_cancel(Eve
-     wxVariant nm, hst;
-     job_list->GetValue(nm, evt.job_id, COL_FILENAME);
-     job_list->GetValue(hst, evt.job_id, COL_HOST);
--    wxGetApp().notification_manager()->upload_job_notification_show_canceled(evt.job_id + 1, boost::nowide::narrow(nm.GetString()), boost::nowide::narrow(hst.GetString()));
-+    wxGetApp().notification_manager()->upload_job_notification_show_canceled(evt.job_id + 1, nm.GetString().ToStdString(), hst.GetString().ToStdString());
- }
- 
- void PrintHostQueueDialog::get_active_jobs(std::vector<std::pair<std::string, std::string>>& ret)
---- a/src/slic3r/GUI/Search.cpp
-+++ b/src/slic3r/GUI/Search.cpp
-@@ -239,7 +239,7 @@ bool OptionsSearcher::search(const std::
-         const Option &opt = options[i];
-         if (full_list) {
-             std::string label = into_u8(get_label(opt));
--            found.emplace_back(FoundOption{ label, label, boost::nowide::narrow(get_tooltip(opt)), i, 0 });
-+            found.emplace_back(FoundOption{ label, label, get_tooltip(opt).ToStdString(), i, 0 });
-             continue;
-         }
- 
-@@ -276,7 +276,7 @@ bool OptionsSearcher::search(const std::
-             boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerStart)));
-             boost::erase_all(label_plain, std::string(1, char(ImGui::ColorMarkerEnd)));
- #endif
--	        found.emplace_back(FoundOption{ label_plain, label_u8, boost::nowide::narrow(get_tooltip(opt)), i, score });
-+	        found.emplace_back(FoundOption{ label_plain, label_u8, get_tooltip(opt).ToStdString(), i, score });
-         }
-     }
- 
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -118,7 +118,7 @@ void resolve_path_from_var(const std::st
-     wxString wxdirs;
-     if (! wxGetEnv(boost::nowide::widen(var), &wxdirs) || wxdirs.empty() )
-         return;
--    std::string dirs = boost::nowide::narrow(wxdirs);
-+    std::string dirs = wxdirs.ToStdString();
-     for (size_t i = dirs.find(':'); i != std::string::npos; i = dirs.find(':'))
-     {
-         paths.push_back(dirs.substr(0, i));
-@@ -303,7 +303,7 @@ void DesktopIntegrationDialog::perform_d
-             // if all failed - try creating default home folder
-             if (i == target_candidates.size() - 1) {
-                 // create $HOME/.local/share
--                create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/icons" + icon_theme_dirs);
-+                create_path(wxFileName::GetHomeDir().ToStdString(), ".local/share/icons" + icon_theme_dirs);
-                 // copy icon
-                 target_dir_icons = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
-                 std::string icon_path = GUI::format("%1%/icons/PrusaSlicer.png",resources_dir());
-@@ -355,7 +355,7 @@ void DesktopIntegrationDialog::perform_d
-             // if all failed - try creating default home folder
-             if (i == target_candidates.size() - 1) {
-                 // create $HOME/.local/share
--                create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/applications");
-+                create_path(wxFileName::GetHomeDir().ToStdString(), ".local/share/applications");
-                 // create desktop file
-                 target_dir_desktop = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
-                 std::string path = GUI::format("%1%/applications/PrusaSlicer%2%.desktop", target_dir_desktop, version_suffix);
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..676680fb4297 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.4.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,7 +11,7 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 51f929f712c075d02998b1f6a27077818d7eacd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:26 +0000
Subject: [PATCH 13/28] blender: revbump for openexr3

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index e15d810c8929..e80446967366 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=3.3.0
-revision=3
+revision=4
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 8d891ba17f984a31dbc00e2330679f597712b995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:36:15 +0100
Subject: [PATCH 14/28] calligra: revbump for openexr3

---
 srcpkgs/calligra/patches/openexr3.patch | 94 +++++++++++++++++++++++++
 srcpkgs/calligra/template               |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/calligra/patches/openexr3.patch

diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..7589f93cb352
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,94 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt                                  | 9 +++++++--
+ libs/pigment/CMakeLists.txt                     | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt       | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+-- 
+GitLab
+
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 9289bab2d6cf..daf927aeb06a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=10
+revision=11
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From e2347378889a2e9e59eeb8a32f31cd1c059a9aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:51:11 +0000
Subject: [PATCH 15/28] darktable: revbump for openexr3

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 3bfe7439fe6b..4677f684645e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=4.0.1
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 764d459eedb472dd48ca279f5eccb44eaecf1b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 13 Oct 2022 18:22:33 +0100
Subject: [PATCH 16/28] gimp: revbump for openexr3

---
 srcpkgs/gimp/template | 2 +-
 srcpkgs/gmic/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 2575c1ee22c3..fb6cb95ff96c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f591b833295b..8e3b80047f26 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -10,7 +10,7 @@ build_helper=qmake
 make_build_args=NOSTRIP=yes
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
  libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
  gtk+-devel gimp-devel qt5-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"

From dd306466993d77dd9e2057b27f09d4d725d54eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 7 Jan 2023 14:26:36 +0000
Subject: [PATCH 17/28] hugin: revbump for openexr3

---
 srcpkgs/hugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 01b8f0b22d0f..2177b3c40d49 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=2
+revision=3
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 90b50c789952850eb4b64ad8810c02122846d013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 2 Nov 2022 11:25:50 +0000
Subject: [PATCH 18/28] kimageformats: revbump for openexr3

---
 srcpkgs/kimageformats/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 337f37a3bb71..e48144056dd5 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools

From e53e90e8601c53322266bfa1f642ff1cb625edab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 25 Dec 2022 18:38:39 +0000
Subject: [PATCH 19/28] kio-extras: revbump for openexr3

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index d14b22c4cc00..338ee04fb412 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From dab99b40ee601eb4c3ea0e0876be1f05bab02e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:53:30 +0000
Subject: [PATCH 20/28] krita: revbump for openexr3

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 0ad47a7fb9ef..e3bbde19a61a 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.8
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From e5f4b4464197aca2afc86a9e893a4900e4cb2429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:52:45 +0000
Subject: [PATCH 21/28]  libgdal: revbump for openexr3

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index efe7a2adcf50..d6a527322ec3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=3
+revision=4
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 57e2749d0c65c248f9b3fd98e53d387d9e644ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 19:54:45 +0000
Subject: [PATCH 22/28] opencv: revbump for openexr3

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 1709747d9656..a09b8dd0d449 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 9095cd61fc93e8b225c9a25dc498b5b486ebdbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 19 Nov 2022 15:25:46 +0000
Subject: [PATCH 23/28] openvdb: revbump for openexr3

---
 srcpkgs/openvdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index abfcde28f7db..d8ef5b4496b9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel imath-devel libopenexr-devel c-blosc-devel
  glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"

From dc24f6e8748e1a268703837bbca9c5ff3881692a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 12 Oct 2022 12:18:36 +0100
Subject: [PATCH 24/28] osg: revbump for openexr3

---
 srcpkgs/osg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index e9bdf294cb8d..71675077ec1f 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
 pkgname=osg
 reverts=3.6.0_1
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 build_helper="qemu"
 # don't use /usr/lib64 on 64bit platforms
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:OSGPL-0.0-or-later"
+license="LGPL-2.1-or-later, WxWindows-exception-3.1, custom:OpenSceneGraph"
 homepage="https://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
 checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5

From 3314d88ba18f10ff407b62d0620ac511dd5d5f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:34 +0100
Subject: [PATCH 25/28] synfig: revbump for openexr3

---
 srcpkgs/synfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 0f4e33bdd781..9666268c708a 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
 # Template file for 'synfig'
 pkgname=synfig
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From b32943358e375dc60ae6f8334921939026274bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:44 +0100
Subject: [PATCH 26/28] synfigstudio: revbump for openexr3

---
 srcpkgs/synfigstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 36646888f255..4b36350f8768 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'synfigstudio'
 pkgname=synfigstudio
 version=1.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 148bc9de1819aa21633734e2dfb2e7006925a005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Oct 2022 10:40:51 +0100
Subject: [PATCH 27/28] vigra: revbump for openexr3

---
 srcpkgs/vigra/patches/openexr3.patch | 40 ++++++++++++++++++++++++++++
 srcpkgs/vigra/template               |  7 +++--
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/vigra/patches/openexr3.patch

diff --git a/srcpkgs/vigra/patches/openexr3.patch b/srcpkgs/vigra/patches/openexr3.patch
new file mode 100644
index 000000000000..b869e858b1cb
--- /dev/null
+++ b/srcpkgs/vigra/patches/openexr3.patch
@@ -0,0 +1,40 @@
+Index: vigra-1.11.1/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/CMakeLists.txt
++++ vigra-1.11.1/CMakeLists.txt
+@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
+ 
+ 
+ IF(WITH_OPENEXR)
++    FIND_PACKAGE(Imath CONFIG)
++    IF(TARGET Imath::Imath)
++        FIND_PACKAGE(OpenEXR CONFIG)
++        SET(OPENEXR_LIBRARIES
++		    OpenEXR::OpenEXR
++		    OpenEXR::Iex
++			OpenEXR::IlmThread
++			Imath::Imath
++		)
++		get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
++		get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
++		include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
++		set(OPENEXR_FOUND TRUE)
++	ELSE()
+     VIGRA_FIND_PACKAGE(OpenEXR)
++	ENDIF()
+ ENDIF()
+ 
+ IF(WITH_HDF5)
+Index: vigra-1.11.1/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.11.1.orig/src/impex/CMakeLists.txt
++++ vigra-1.11.1/src/impex/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
+ ENDIF(TIFF_FOUND)
+ 
+ IF(OPENEXR_FOUND)
++  cmake_policy(SET CMP0028 NEW)
+   TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
+ ENDIF(OPENEXR_FOUND)
+ 
+
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index d2e91a7019b0..055d5a3b7f6c 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,18 +1,19 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"
 makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel libopenexr-devel imath-devel"
 short_desc="Image processing and analysis library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://ukoethe.github.io/vigra/"
 distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz"
 checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e
+make_check=no # all tests fail with: [Unknown system error -8] Process not started
 python_version=3
 
 pre_configure() {
@@ -27,8 +28,6 @@ post_install() {
 	vlicense LICENSE.txt
 	vmkdir usr/share/$pkgname
 	mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc
-	vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \
-		$DESTDIR/usr/bin/vigra-config
 }
 
 vigra-doc_package() {

From fd3a3f30031dea01ce65be80bdb64b663b4cd5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 20 Nov 2022 10:53:37 +0000
Subject: [PATCH 28/28] vips: revbump for openexr3

---
 srcpkgs/vips/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f8d810e7b9c6..aa2d766ebfe2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.12.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: [PR PATCH] [Merged]: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (48 preceding siblings ...)
  2023-01-09 12:45 ` [PR PATCH] [Updated] " Johnnynator
@ 2023-01-09 14:31 ` Johnnynator
  2023-01-09 15:39 ` motorto
  50 siblings, 0 replies; 52+ messages in thread
From: Johnnynator @ 2023-01-09 14:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

There's a merged pull request on the void-packages repository

openexr3.0 update
https://github.com/void-linux/void-packages/pull/39852

Description:
[ci-skip] [ci skip]

# TODO:

- **Review**. (If someone could do a rebuild of everything changed here would be highly appreciated, I am currently
leaving my laptop overnight compiling everything with xxbuild for a specific arch, see below what I have already tested, getting some crossbuilding testing would be nice)

## New Templates

- robin-map 1.0.1
- pystring 1.1.3

## Changed Templates:

- alembic 1.7.16 --> 1.8.3 (adopt)
- ilmbase --> imath 3.1.5
- openexr 2.4.1 --> 3.1.5 (adopt)
- gmic 2.9.9 --> 3.1.6
- opencolorio 1.1.1 --> 2.1.2
- openimageio 2.2.15.1 --> 2.3.18.0.

## Revbumped (xrevshlib)

- Field3D
- ImageMagick
- PrusaSlicer
- blender
- calligra
- darktable
- gimp
- hugin
- kimageformats
- kio-extras
- krita
- libgdal
- opencv
- openvdb
- osg
- synfig
- synfigstudio
- vigra
- vips

## Local build testing
- x86_64  (native)
- x86_64-musl (native) 
- i686 (native)
- armv6l (cross)

<!--
- armv7l-musl  (crossbuilding)
- armv7l  (crossbuilding)
- armv6l-musl  (crossbuilding)
- armv6l (crossbuilding)
-->

^ permalink raw reply	[flat|nested] 52+ messages in thread

* Re: openexr3.0 update
  2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
                   ` (49 preceding siblings ...)
  2023-01-09 14:31 ` [PR PATCH] [Merged]: " Johnnynator
@ 2023-01-09 15:39 ` motorto
  50 siblings, 0 replies; 52+ messages in thread
From: motorto @ 2023-01-09 15:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39852#issuecomment-1375819339

Comment:
> I (force) pushed some changes to your branch:
> 
>     * Readded some revbumps that got lost while rebasing
> 
>     * removed cereal.patch from PrusaSlicer (was already added in the boost revbump with a different name)
> 
>     * Properly removed ilmbase (there was still a reference in common/shlibs before)

Glad you noticed that issue with the ilmbase shlibs it completely passed me by. 

Thanks for taking the time to review this huge pr.

^ permalink raw reply	[flat|nested] 52+ messages in thread

end of thread, other threads:[~2023-01-09 15:39 UTC | newest]

Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-09 21:45 [PR PATCH] New package: imath-3.1.5 motorto
2022-10-09 22:03 ` [PR PATCH] [Updated] " motorto
2022-10-15 11:46 ` motorto
2022-10-15 17:31 ` motorto
2022-10-15 17:39 ` [PR PATCH] [Updated] openexr3.0 update motorto
2022-10-16 13:38 ` motorto
2022-10-16 13:43 ` lemmi
2022-10-16 15:37 ` Johnnynator
2022-10-16 15:37 ` Johnnynator
2022-10-16 19:51 ` [PR PATCH] [Updated] " motorto
2022-10-16 20:19 ` motorto
2022-10-16 20:38 ` motorto
2022-10-16 21:05 ` motorto
2022-10-16 21:06 ` motorto
2022-10-16 21:15 ` motorto
2022-10-16 22:16 ` motorto
2022-10-17  8:42 ` motorto
2022-10-17 12:40 ` motorto
2022-10-17 21:49 ` motorto
2022-10-17 21:58 ` motorto
2022-10-17 22:01 ` motorto
2022-10-18 14:40 ` motorto
2022-10-18 14:44 ` motorto
2022-10-23 11:45 ` [PR PATCH] [Updated] " motorto
2022-10-24 13:34 ` motorto
2022-10-26  8:45 ` motorto
2022-11-02 11:21 ` motorto
2022-11-02 11:26 ` motorto
2022-11-03  8:47 ` motorto
2022-11-04 12:20 ` motorto
2022-11-05 21:54 ` motorto
2022-11-18  8:30 ` motorto
2022-11-18  9:35 ` motorto
2022-11-19 15:29 ` motorto
2022-11-20 10:50 ` motorto
2022-11-20 10:53 ` motorto
2022-11-20 10:54 ` motorto
2022-11-23  8:39 ` motorto
2022-12-23  0:43 ` motorto
2022-12-24 13:22 ` motorto
2022-12-24 13:25 ` motorto
2022-12-25 18:40 ` [PR PATCH] [Updated] " motorto
2022-12-25 18:46 ` motorto
2022-12-25 18:49 ` motorto
2023-01-02 14:05 ` motorto
2023-01-07 14:22 ` motorto
2023-01-07 14:27 ` motorto
2023-01-09 12:07 ` Johnnynator
2023-01-09 12:07 ` Johnnynator
2023-01-09 12:45 ` [PR PATCH] [Updated] " Johnnynator
2023-01-09 14:31 ` [PR PATCH] [Merged]: " Johnnynator
2023-01-09 15:39 ` motorto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).