From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openexr3.0 update
Date: Sun, 20 Nov 2022 11:53:59 +0100 [thread overview]
Message-ID: <20221120105359.WVZZ2guSIWwzdkYWT28gqaxbdktL0qi5Blun3xPXhMI@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: 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,
next prev parent reply other threads:[~2022-11-20 10:54 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 ` [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 [this message]
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=20221120105359.WVZZ2guSIWwzdkYWT28gqaxbdktL0qi5Blun3xPXhMI@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).