From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openexr3.0 update
Date: Sat, 15 Oct 2022 19:39:02 +0200 [thread overview]
Message-ID: <20221015173902.rjewyjt_9uRo78KbTjmPATdPQeNV_7J4S8YlQdOJKDU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39852@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2022-10-15 17:39 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` motorto [this message]
2022-10-16 13:38 ` openexr3.0 update 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221015173902.rjewyjt_9uRo78KbTjmPATdPQeNV_7J4S8YlQdOJKDU@z \
--to=motorto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).