Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openexr: update to 3.2.1.
@ 2023-10-11 11:59 motorto
  2023-10-11 16:53 ` [PR PATCH] [Updated] " motorto
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: motorto @ 2023-10-11 11:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

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

From 65503cfeb2bba940135250672215d129ba0172d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 12:44:38 +0100
Subject: [PATCH] openexr: update to 3.2.1.

---
 srcpkgs/openexr/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..9e0376466dcf9 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
@ 2023-10-11 16:53 ` motorto
  2023-10-20 15:15 ` motorto
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-11 16:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

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

From 31a00fe3cb1ba8c0538df4b122286e78a625c8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 12:44:38 +0100
Subject: [PATCH 01/19] openexr: update to 3.2.1.

---
 common/shlibs            | 12 +++++-------
 srcpkgs/openexr/template |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 932ae5dae9732..84fd0a3d657f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
@@ -4233,11 +4231,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..9e0376466dcf9 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

From d642ec7be9a265c424f897332882f0e62e22decb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:45 +0100
Subject: [PATCH 02/19] blender: revbump for openexr-3.2.1 update.

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

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

From b47c2f30c279c981004c51ae489040e1ef87dadd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:46 +0100
Subject: [PATCH 03/19] darktable: revbump for openexr-3.2.1 update.

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

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

From 57a63ff58441fdfbb13034413cb7f2509a128c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:46 +0100
Subject: [PATCH 04/19] gimp: revbump for openexr-3.2.1 update.

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

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

From 92a1e230d1c0b94283a84e2138e533d1e345636e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:46 +0100
Subject: [PATCH 05/19] gmic: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 6c509a46bc17dd64b9764d58dfbd580e90264277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:47 +0100
Subject: [PATCH 06/19] hugin: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From bad4b2c303eefb7942034f7315b1cdb3879ab405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:47 +0100
Subject: [PATCH 07/19] ImageMagick: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From 2bc18e3a349bdbad93b40c551b12537deb52ab31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:48 +0100
Subject: [PATCH 08/19] kimageformats: revbump for openexr-3.2.1 update.

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

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

From b3c963200fd50f3fceeaa82add243dc04db94215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:48 +0100
Subject: [PATCH 09/19] kio-extras: revbump for openexr-3.2.1 update.

---
 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 e487fab269d9b..536428bce2b5f 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 db58313c2b05cc49568900719ab90c0680bae59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:48 +0100
Subject: [PATCH 10/19] krita: revbump for openexr-3.2.1 update.

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

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

From 578574a5f9f529a02b16d7a1f17a97ccf9da3a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:49 +0100
Subject: [PATCH 11/19] libgdal: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 89e80318e8f2c19cf4cc8c93d0191dfa1467306c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:49 +0100
Subject: [PATCH 12/19] libjxl: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From b5c85e4a841585e47c419547575de60033c7d7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:50 +0100
Subject: [PATCH 13/19] opencv: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 4eced54467bbc5337f172226fb60ca78dc10e350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:50 +0100
Subject: [PATCH 14/19] openimageio: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..d7ad79563a2af 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From 97cf913c2c75a270c0b01dadc125eeb57147fbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:50 +0100
Subject: [PATCH 15/19] swayimg: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 9bc1fad7f5464e3c2743abf189c3238203c9f0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:51 +0100
Subject: [PATCH 16/19] synfig: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 3a92b421c15abaf81a223a8d052f39cd6460d799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:51 +0100
Subject: [PATCH 17/19] synfigstudio: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 728d5ff23bb137eb56a988b95f0e4528fe69da26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:52 +0100
Subject: [PATCH 18/19] vigra: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 0ed638bcd9902..cf79103fec297 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=11
+revision=12
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From 39c938b391abf1dce4bb324a9e160c09d34925af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 11 Oct 2023 17:19:52 +0100
Subject: [PATCH 19/19] vips: revbump for openexr-3.2.1 update.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
  2023-10-11 16:53 ` [PR PATCH] [Updated] " motorto
@ 2023-10-20 15:15 ` motorto
  2023-10-20 17:49 ` motorto
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-20 15:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

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

From 3be4f4e735522aeb89ca03e6f31a5c345ee2031a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH] openexr: update to 3.2.1.

---
 srcpkgs/openexr/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..9e0376466dcf9 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
  2023-10-11 16:53 ` [PR PATCH] [Updated] " motorto
  2023-10-20 15:15 ` motorto
@ 2023-10-20 17:49 ` motorto
  2023-10-20 18:29 ` motorto
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-20 17:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

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

From e298e103ffb87f18bc091ea07fcedd91f4913525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 1/2] openexr: update to 3.2.1.

---
 srcpkgs/openexr/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From 073e93966c1d10f28f3fbf2355218f17bf8b9cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 2/2] common/shlibs: cleanup openexr.

---
 common/shlibs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 987b52451767a..47586a79878d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (2 preceding siblings ...)
  2023-10-20 17:49 ` motorto
@ 2023-10-20 18:29 ` motorto
  2023-10-20 20:05 ` motorto
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-20 18:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

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

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

From e298e103ffb87f18bc091ea07fcedd91f4913525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 srcpkgs/openexr/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From b2f68ab49992349150f06b715765ce1d5a178f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 12 +++++-------
 srcpkgs/openexr/template |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 987b52451767a..12c99a52842f4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
@@ -4228,11 +4226,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.30 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From 27954d2a1506d68712dda8d974516259dce1ba91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From 9b35ef0effc4c16f6378ba3133043dc89f97763b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 9f4496c12df062ebc58cf7366b36ad2b712f26e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From e98baf573fb41659166e902f7c7c692116167649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 05551ebf3e326aef2af8525f5136f74b7507da4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 8690934a31ffa772b44f100271f697e9d8059459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From fc813110d15b7fc588c057fbfde5d51a80603fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From 91da81134bf038a77a8d4d6ca6f1cb58d0ba607e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 e487fab269d9b..536428bce2b5f 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 5bf4bba4615c9363ea1fbefe2555ea41dd1185f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 4052daafbc758f828388c470e676e2dd3e837efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 0abc05874b1dba363c2f32474518f978aa00fa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From c120d0178b86bc93eaa9434aa7fa6c845ccfcf5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 5b865bd714b2a78850a482e3072089c5fb81230f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..d7ad79563a2af 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From 8e1dc1b4ad49d3e533d636e780d5a67b7ed365e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 0ebe697c9647b6708e4d4b56772fa0fc4d55b89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 6bb2fa22904d06681c6a2a0c76e58c3a909e9a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 9c912d1d68615200c480ed1ccba3ca401f2ab84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 0ed638bcd9902..cf79103fec297 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=11
+revision=12
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From bd57b3ae08bdb6fc28bfedafccdfdee602a380dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (3 preceding siblings ...)
  2023-10-20 18:29 ` motorto
@ 2023-10-20 20:05 ` motorto
  2023-10-21 13:31 ` motorto
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-20 20:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

[ci skip]

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

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

From 6132540badb595c9d683a04f84f4b025bf9f6441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 common/shlibs            | 10 +++++-----
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 987b52451767a..3b9c004233a95 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4228,11 +4228,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From f60c7cc4a05f15a1110c6265ea35c64969206441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 2 --
 srcpkgs/openexr/template | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b9c004233a95..419c0cee4fbba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From b243f4a25244074382e6ee30413a3d070949ef5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From c00429f560b7825440b6f2ebe8379f0cee7ef72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 38428e90e50687436bc36c8c2d279b8d6297ca11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From 70534d96f73017cfd46f29c01d6dd45ef7a9fbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From df1e84912af1b3d4f2272d8396c4d68ffff75319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From aed48d02a9c33d4f76cc0aec3570c4923941b006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From e3aee812a9490d0df44fbfcbbb60528b56c7cad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From 2c83e6b87fd196049f71c6550889561a37ee5b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 e487fab269d9b..536428bce2b5f 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 5418d66b6f9698001596b561fa729e1d0b3ab692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 76ac52509aea1c99ae37182ad42cd77f841738d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 3cd5d1443206db101127b7e1f2cbcc21825b5b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From 083a798e03d00bdf8dd0ce053ffc6426d76aff8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 94048706929c1014da982b72944896b2763b07ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..d7ad79563a2af 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From a444e27499eafd43c0e067c89245c5f5498c37e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From c278c68e5b652f0961c10d877ad41ee711762efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 812a078ac1afe4ac2271feee213bff7a7220a0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From b7e12e919d701f799d61847b185ec37b006366e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 0ed638bcd9902..cf79103fec297 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=11
+revision=12
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From b1a3b17434c2047508a24a592c6c8c24ef9f1895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (4 preceding siblings ...)
  2023-10-20 20:05 ` motorto
@ 2023-10-21 13:31 ` motorto
  2023-11-01 17:15 ` motorto
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-10-21 13:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)


<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host         target       cross  result
openexr        x86_64-musl  x86_64-musl  n      OK
ImageMagick    x86_64-musl  x86_64-musl  n      OK
gimp           x86_64-musl  x86_64-musl  n      OK
opencv         x86_64-musl  x86_64-musl  n      OK
synfig         x86_64-musl  x86_64-musl  n      OK
libjxl         x86_64-musl  x86_64-musl  n      OK
vigra          x86_64-musl  x86_64-musl  n      FAILED
gmic           x86_64-musl  x86_64-musl  n      OK
openimageio    x86_64-musl  x86_64-musl  n      OK
vips           x86_64-musl  x86_64-musl  n      OK
synfigstudio   x86_64-musl  x86_64-musl  n      OK
swayimg        x86_64-musl  x86_64-musl  n      OK
libgdal        x86_64-musl  x86_64-musl  n      OK
krita          x86_64-musl  x86_64-musl  n      OK
kio-extras     x86_64-musl  x86_64-musl  n      OK
kimageformats  x86_64-musl  x86_64-musl  n      OK
hugin          x86_64-musl  x86_64-musl  n      OK
darktable      x86_64-musl  x86_64-musl  n      OK
blender        x86_64-musl  x86_64-musl  n      OK
```

```
openexr        x86_64       x86_64       n      OK
ImageMagick    x86_64       x86_64       n      OK
gimp           x86_64       x86_64       n      OK
opencv         x86_64       x86_64       n      OK
synfig         x86_64       x86_64       n      OK
libjxl         x86_64       x86_64       n      OK
vigra          x86_64       x86_64       n      FAILED
gmic           x86_64       x86_64       n      OK
openimageio    x86_64       x86_64       n      OK
vips           x86_64       x86_64       n      OK
synfigstudio   x86_64       x86_64       n      OK
swayimg        x86_64       x86_64       n      OK
libgdal        x86_64       x86_64       n      OK
krita          x86_64       x86_64       n      OK
kio-extras     x86_64       x86_64       n      OK
kimageformats  x86_64       x86_64       n      OK
hugin          x86_64       x86_64       n      OK
darktable      x86_64       x86_64       n      OK
blender        x86_64       x86_64       n      OK
```

```
openexr        x86_64       aarch64      y      OK
ImageMagick    x86_64       aarch64      y      OK
gimp           x86_64       aarch64      y      OK
opencv         x86_64       aarch64      y      OK
synfig         x86_64       aarch64      y      OK
libjxl         x86_64       aarch64      y      FAILED
vigra          x86_64       aarch64      y      FAILED
gmic           x86_64       aarch64      y      OK
openimageio    x86_64       aarch64      y      OK
vips           x86_64       aarch64      y      OK
synfigstudio   x86_64       aarch64      y      OK
swayimg        x86_64       aarch64      y      OK
libgdal        x86_64       aarch64      y      OK
krita          x86_64       aarch64      y      OK
kio-extras     x86_64       aarch64      y      OK
kimageformats  x86_64       aarch64      y      OK
hugin          x86_64       aarch64      y      OK
darktable      x86_64       aarch64      y      OK
blender        x86_64       aarch64      y      OK
```
</details>

[ci skip]

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

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

From 6132540badb595c9d683a04f84f4b025bf9f6441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 common/shlibs            | 10 +++++-----
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 987b52451767a..3b9c004233a95 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4228,11 +4228,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From f60c7cc4a05f15a1110c6265ea35c64969206441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 2 --
 srcpkgs/openexr/template | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3b9c004233a95..419c0cee4fbba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From b243f4a25244074382e6ee30413a3d070949ef5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From c00429f560b7825440b6f2ebe8379f0cee7ef72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 38428e90e50687436bc36c8c2d279b8d6297ca11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From 70534d96f73017cfd46f29c01d6dd45ef7a9fbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From df1e84912af1b3d4f2272d8396c4d68ffff75319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From aed48d02a9c33d4f76cc0aec3570c4923941b006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From e3aee812a9490d0df44fbfcbbb60528b56c7cad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From 2c83e6b87fd196049f71c6550889561a37ee5b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 e487fab269d9b..536428bce2b5f 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 5418d66b6f9698001596b561fa729e1d0b3ab692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 76ac52509aea1c99ae37182ad42cd77f841738d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 3cd5d1443206db101127b7e1f2cbcc21825b5b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From 083a798e03d00bdf8dd0ce053ffc6426d76aff8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From de966656da8acc87791943afc6da75529d39dc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 42555fc230ab7569d8cddb7c595f0bf0aab4c71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 83ab822af51c0e94d3eec872905876b684f0c0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 986c9108015d493997f4186d7b025578606692c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From b7ea6955edee9b1ee8565ff2d6eac45a7537dbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 0ed638bcd9902..cf79103fec297 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.1
-revision=11
+revision=12
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From a8c7af624d1418c2c866fbd047b1ec550d6e0412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (5 preceding siblings ...)
  2023-10-21 13:31 ` motorto
@ 2023-11-01 17:15 ` motorto
  2023-11-04 21:00 ` motorto
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-11-01 17:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      FAILED
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      FAILED
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```
</details>

[ci skip]

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

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

From 2975bf00840d281b778f98171c8b4cfe3db1b18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 common/shlibs            | 10 +++++-----
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..90a693d28225f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4231,11 +4231,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From 694312eaf15fe49f8634acf02d973a82b446aee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 2 --
 srcpkgs/openexr/template | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 90a693d28225f..2fa6913352722 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From b0db69b49d55fa63dbe347f9d871245702c57f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From 64b5f5394c29f80dd2a99b009e43b2c6a557e829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 1c728442edb3f296d050f23931250c229464cdce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From 9d0b9824ffb3a5d49da37f661b68d8ac5650eafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 42bac7e33bfafad3f5204906ca6d56abeb2b5b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 1917098e2adcdd5276f608d72822762b7f598370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From 246dd018a46ba0f92d3e9388bc109aa3501fce72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From 3b6f6ef60068e9cdabb145124ad7ebe6dfd69968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 7ba46e5184f1c..8b4e52176a9e1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 e05730a5e6deef9b3795f0ca7936f4c8b65145ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 29a6297079359e0379e4908953119877ea47ee1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 350f56bff4deb72c1922c6973ed1df40f2aa00e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From 30debfed4ace31a2c3211d0aceafc8e4c4946aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 7e521146afd6fb0a92034ea8343d9e4a336f5be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 11f822ddf9d4d75bb5c96228f73d9609c94461d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 8e688189156292c21605fba7c3bccdb7ea81d1d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From cbded7f67b9c77f59f391ed41f3f69a52c6d6630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 584e6a9ac01fedecbc308ea473731b55d40024ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 039c6c49a04a6..a0146228ae67f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From 41f8f1f383de8a2ab7dd9198140ac52c53aa2a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (6 preceding siblings ...)
  2023-11-01 17:15 ` motorto
@ 2023-11-04 21:00 ` motorto
  2023-11-05 20:38 ` motorto
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-11-04 21:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      FAILED
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      FAILED
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```
</details>

[ci skip]

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

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

From 50695f9285979fe1dbd6f26388873718faf8a316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 common/shlibs            | 10 +++++-----
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..90a693d28225f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4231,11 +4231,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From 970523d1a076adfda16420ef726e5da763fff1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 2 --
 srcpkgs/openexr/template | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 90a693d28225f..2fa6913352722 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From ab879989164a822c3415c0e8d1806f91f265ea9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From 8ed94388c6a8a934e49b47a434319fec19d3bec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 4cbca5f803fec385293029a4e6367c33b43e47fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From ce56eb9b646a81b72cb18788f55f58d7ca8788b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 6dbed9460e162724f5fced774c07e3877c74157e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 2d2f1d0b6ea2a99f89dadc9ba38e0cd681243aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From ba036a8cb3ef4eb2dd01834dafe913848c571a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From ec7ff077b39a257d2ab1ea92d1543f6e2fabe829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 7ba46e5184f1c..8b4e52176a9e1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 1bd2c3aefcf2e87a41503e0814da929e14042577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 50b98555cac15e66bf8daae3586815b1da8f979e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 5eacefbf06262991decd57a2f8e3cdf0dbd002f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From c0684adb09b6766f74668d618e438e77974bf85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 6ebc7166ac8183a63dd3d2f0915e0361678a880a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 242edc3348f179fccef7879e81f0fc3c6aaff53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From db443b309eb9ca8970acdf4593f28ff34e3d7e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 87e876712fc05af2219c2f84e44cdf49567cfd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From d90307216d289ffea649015263d6f568b5d254a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 039c6c49a04a6..a0146228ae67f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From dded51ac655ca68c10b77cc69bc228e69917eaaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (7 preceding siblings ...)
  2023-11-04 21:00 ` motorto
@ 2023-11-05 20:38 ` motorto
  2023-11-05 20:52 ` motorto
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-11-05 20:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
-  Cross build - aarch64

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target  cross  result
openexr        x86_64  x86_64  n      OK
ImageMagick    x86_64  x86_64  n      OK
gimp           x86_64  x86_64  n      OK
opencv         x86_64  x86_64  n      OK
synfig         x86_64  x86_64  n      OK
libjxl         x86_64  x86_64  n      OK
vigra          x86_64  x86_64  n      OK
gmic           x86_64  x86_64  n      OK
openimageio    x86_64  x86_64  n      OK
vips           x86_64  x86_64  n      OK
synfigstudio   x86_64  x86_64  n      OK
swayimg        x86_64  x86_64  n      OK
libgdal        x86_64  x86_64  n      OK
krita          x86_64  x86_64  n      OK
kio-extras     x86_64  x86_64  n      OK
kimageformats  x86_64  x86_64  n      OK
hugin          x86_64  x86_64  n      OK
darktable      x86_64  x86_64  n      OK
blender        x86_64  x86_64  n      OK
```

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      OK
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      OK
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```

</details>

[ci skip]

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

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

From 111a7621f6b1bbf06f2f67afe0f237b2d7a92872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/20] openexr: update to 3.2.1.

---
 common/shlibs            | 10 +++++-----
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..90a693d28225f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4231,11 +4231,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..99bc155a9474a 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From b9b291b322536ed5de6cf89df1338c25e398369c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 17:04:39 +0100
Subject: [PATCH 02/20] common/shlibs: cleanup openexr.

---
 common/shlibs            | 2 --
 srcpkgs/openexr/template | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 90a693d28225f..2fa6913352722 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 99bc155a9474a..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -20,7 +20,7 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ] || ["$XBPS_LIBC" = "musl" ]; then
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
 	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)

From c175c2b996134487996aac17877e08e427262328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/20] blender: :revbump for openexr 3.2.1.

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

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

From f7108341979d84186279ec5e06cceceb5d51ee31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/20] darktable: :revbump for openexr 3.2.1.

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

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

From 1f27669256c8510f5abfb24590826342dc97c6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 05/20] gimp: :revbump for openexr 3.2.1.

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

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

From f5cf7f1ae29e0c1d3fcdc12fac3cd72c361f5834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/20] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From e7feb4e467804bc956a47efeef12b707a2f0b59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 07/20] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 170cbc98d2218692bcfdd9a7ed72337207bc21fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/20] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From 46ebb20aea21230826e60a305096a7a12e17b961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/20] kimageformats: :revbump for openexr 3.2.1.

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

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

From b756acb328400f7c50f5fc25983f8b3d26741d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 10/20] kio-extras: :revbump for openexr 3.2.1.

---
 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 7ba46e5184f1c..8b4e52176a9e1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 5fce7509e4bbbe4a27f2fe792f97b0ffaebe345a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/20] krita: :revbump for openexr 3.2.1.

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

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

From 17c3ea0c4f6f83d9de22b7516567fc99518c2f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 12/20] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 324fc0360e6743836ebfea5efd66711e71fea8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/20] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From e531c485dc975dfbea2a72e517203ce45a19423b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/20] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 84dec7d043433150587b0bffba3c3809aff203b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 15/20] openimageio: :revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 39ba48fbd5ce9696e4df5615251e29b185c32149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/20] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From e20f3d107e0fbb543cbddbcd56cef94381b439e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 17/20] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From f93b9a75b9c64b1d2a56337a58a772d5f8079000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/20] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 5668eccda4161b2934eb9172c553627effb25c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/20] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 039c6c49a04a6..a0146228ae67f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From a5bf2948fc8a225de3f35233bca49a6cf416c0dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 20/20] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (8 preceding siblings ...)
  2023-11-05 20:38 ` motorto
@ 2023-11-05 20:52 ` motorto
  2023-11-05 21:05 ` motorto
  2023-11-07 17:51 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-11-05 20:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
-  Cross build - aarch64

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target  cross  result
openexr        x86_64  x86_64  n      OK
ImageMagick    x86_64  x86_64  n      OK
gimp           x86_64  x86_64  n      OK
opencv         x86_64  x86_64  n      OK
synfig         x86_64  x86_64  n      OK
libjxl         x86_64  x86_64  n      OK
vigra          x86_64  x86_64  n      OK
gmic           x86_64  x86_64  n      OK
openimageio    x86_64  x86_64  n      OK
vips           x86_64  x86_64  n      OK
synfigstudio   x86_64  x86_64  n      OK
swayimg        x86_64  x86_64  n      OK
libgdal        x86_64  x86_64  n      OK
krita          x86_64  x86_64  n      OK
kio-extras     x86_64  x86_64  n      OK
kimageformats  x86_64  x86_64  n      OK
hugin          x86_64  x86_64  n      OK
darktable      x86_64  x86_64  n      OK
blender        x86_64  x86_64  n      OK
```

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      OK
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      OK
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```

</details>

[ci skip]

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

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

From f0baa72a0138f6b7595ea5b59c0b27ebf574365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/19] openexr: update to 3.2.1.

---
 common/shlibs            | 12 +++++-------
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..2fa6913352722 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
@@ -4231,11 +4229,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From 9737f802f8c878e05fab202ac57637207a908728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 02/19] blender: :revbump for openexr 3.2.1.

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

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

From effd956c9c918ce492bb6becb176235cb8031a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/19] darktable: :revbump for openexr 3.2.1.

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

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

From 0cfbdc9c481a15b1cd37acb114888070e5335c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/19] gimp: :revbump for openexr 3.2.1.

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

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

From 15fcee002f760d7d8e517e51166788ef208dcb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 05/19] gmic: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 6b97e7a1f636ace0a33c23ef63b8aabc8f472ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/19] hugin: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 52839c80f743953790480cf8a6ac73163bc6005a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 07/19] ImageMagick: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From d37f90b259b7255174b377fdbd0c4c23cc2f7825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/19] kimageformats: :revbump for openexr 3.2.1.

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

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

From 0d8019c7851e73bf38749424c33d02851f2b0e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/19] kio-extras: :revbump for openexr 3.2.1.

---
 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 7ba46e5184f1c..8b4e52176a9e1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 ca21be89397fd28e06ceba5d73b1e378827c10e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 10/19] krita: :revbump for openexr 3.2.1.

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

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

From 39eb7732eec4553fa7cd27dd918ba2c07e9d7301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/19] libgdal: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 7dd638ad80e56e06a0e324d44bd65a05cf435d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 12/19] libjxl: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From 7ea5681cdfb1b765e5a95bf41c075d7c97a63773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/19] opencv: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From d68d0877653981473faaeeac40fce858ea9dfb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/19] openimageio: :revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 3167578e392386fc77dfa161d0ee4d66d147a0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 15/19] swayimg: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 8da2dcf78043e5d42b1484149ec9d23f72811bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/19] synfig: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 4cf3e2b855b8c28d6c963f0e846ac8e08723ce30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 17/19] synfigstudio: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From 23e988e05ba5f27cf6051c0ca50ca8f21f007607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/19] vigra: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 039c6c49a04a6..a0146228ae67f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From 2560437931aed3136dc84f53cc6910bb4997abf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/19] vips: :revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Updated] openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (9 preceding siblings ...)
  2023-11-05 20:52 ` motorto
@ 2023-11-05 21:05 ` motorto
  2023-11-07 17:51 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: motorto @ 2023-11-05 21:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/motorto/void-packages openexr-3.2.1
https://github.com/void-linux/void-packages/pull/46593

openexr: update to 3.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
-  Cross build - aarch64

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target  cross  result
openexr        x86_64  x86_64  n      OK
ImageMagick    x86_64  x86_64  n      OK
gimp           x86_64  x86_64  n      OK
opencv         x86_64  x86_64  n      OK
synfig         x86_64  x86_64  n      OK
libjxl         x86_64  x86_64  n      OK
vigra          x86_64  x86_64  n      OK
gmic           x86_64  x86_64  n      OK
openimageio    x86_64  x86_64  n      OK
vips           x86_64  x86_64  n      OK
synfigstudio   x86_64  x86_64  n      OK
swayimg        x86_64  x86_64  n      OK
libgdal        x86_64  x86_64  n      OK
krita          x86_64  x86_64  n      OK
kio-extras     x86_64  x86_64  n      OK
kimageformats  x86_64  x86_64  n      OK
hugin          x86_64  x86_64  n      OK
darktable      x86_64  x86_64  n      OK
blender        x86_64  x86_64  n      OK
```

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      OK
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      OK
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```

</details>

[ci skip]

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

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

From f0baa72a0138f6b7595ea5b59c0b27ebf574365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 16:12:49 +0100
Subject: [PATCH 01/19] openexr: update to 3.2.1.

---
 common/shlibs            | 12 +++++-------
 srcpkgs/openexr/template | 13 +++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..2fa6913352722 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1675,8 +1675,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
@@ -4231,11 +4229,11 @@ libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
 libImath-3_1.so.29 imath-3.1.9_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
+libIex-3_2.so.31 libopenexr-3.2.1_1
+libIlmThread-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXR-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRCore-3_2.so.31 libopenexr-3.2.1_1
+libOpenEXRUtil-3_2.so.31 libopenexr-3.2.1_1
 libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index b082a724b9b06..b0a816d838bbb 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,18 +1,18 @@
 # Template file for 'openexr'
 pkgname=openexr
-version=3.1.11
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel imath-devel"
+makedepends="imath-devel libdeflate-devel"
 short_desc="High dynamic-range (HDR) image file format"
 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>openexr-${version}.tar.gz"
-checksum=06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1
+checksum=61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -20,10 +20,11 @@ else
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
-	make_check=no # Test Fails in i686
+if [ "$XBPS_MACHINE" = "i686" ] || [ "$XBPS_LIBC" = "musl" ]; then
 	# See upstream:
-	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1281 (i686)
+	# https://github.com/AcademySoftwareFoundation/openexr/issues/1556 (musl)
+	make_check=no
 fi
 
 post_install() {

From a1009c4f4b4f8a74744974578f347d11e296f29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 02/19] blender: revbump for openexr 3.2.1.

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

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

From 08013955d30b8ae1b545ccd69b99fcda29e33899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 03/19] darktable: revbump for openexr 3.2.1.

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

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

From 2cf91d0c3695059a4777dc14048998dae7babe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:34 +0100
Subject: [PATCH 04/19] gimp: revbump for openexr 3.2.1.

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

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

From fb3c87f03c74158a9a0c1d1a55e0021b3290e78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 05/19] gmic: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 0bb4034d5cc86..808953e9b543c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,7 +1,7 @@
 # Template file for 'gmic'
 pkgname=gmic
 version=3.1.6
-revision=4
+revision=5
 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
 create_wrksrc=yes
 build_wrksrc="src"

From 771efd8a57cf8f66bfd877de742984c4b65c8a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:35 +0100
Subject: [PATCH 06/19] hugin: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index f96d2f6e27d42..ce71f6e4cbb2d 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2022.0.0
-revision=10
+revision=11
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"

From 9ac4ff152f44b8b5670ccb4a9376d1ebc97bc04a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 07/19] ImageMagick: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3af5e375f483b..cf7e696d36776 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -2,7 +2,7 @@
 pkgname=ImageMagick
 # Revbump php*-imagick with ImageMagick updates.
 version=7.1.1.18
-revision=1
+revision=2
 _upstream_version="${version/.${version##*.}/-${version##*.}}"
 build_style=gnu-configure
 configure_args="--disable-static --enable-opencl --with-modules --with-gslib

From 91fbf934baa1fa455fbcc951ceef23fcde47fee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 08/19] kimageformats: revbump for openexr 3.2.1.

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

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

From b0136688f0b0da9e46ef5d3f88fdab8a608f84ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:36 +0100
Subject: [PATCH 09/19] kio-extras: revbump for openexr 3.2.1.

---
 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 7ba46e5184f1c..8b4e52176a9e1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=23.04.0
-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 c93ffb69fb0cbea01efd7ffb574ff4c4b81d4d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 10/19] krita: revbump for openexr 3.2.1.

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

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

From 738608ec4bbacaba9ca04367831cd15d3b0770d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:37 +0100
Subject: [PATCH 11/19] libgdal: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 082edda843c99..d5850fb768f66 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.5.3
-revision=11
+revision=12
 build_style=cmake
 build_helper=python3
 configure_args="-DGDAL_USE_OPENCL=ON

From 3fb6957ebbaec6d64f28bbf85184a438dca9e5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 12/19] libjxl: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index e04206eb780d4..cb2a08809b055 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,7 +1,7 @@
 # Template file for 'libjxl'
 pkgname=libjxl
 version=0.8.2
-revision=1
+revision=2
 _testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
 _skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
 build_style=cmake

From 0e20275939a1a4404890fd68594e1ab4dc5c50b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 13/19] opencv: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 8a7eb6a5ddc5b..aea4bfc3a265c 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=4.6.0
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From 7afdc8296738d302e459a50755d3ce42700305e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:38 +0100
Subject: [PATCH 14/19] openimageio: revbump for openexr 3.2.1.

- fix checksum.
---
 srcpkgs/openimageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index d8a6ba56efd11..3ce3f9e49d350 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=6
+revision=7
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
@@ -18,7 +18,7 @@ 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/v${version}.tar.gz"
-checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed
+checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7
 # Runs checks even for features we disabled.
 make_check=no
 

From 5eb44940fffedaf2ac5a7a8feea8c143ae29342d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 15/19] swayimg: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 9014c470af188..308d438a6dfa6 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,7 +1,7 @@
 # Template file for 'swayimg'
 pkgname=swayimg
 version=1.12
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel

From 9da30c8e05594e82f43ba7108149815144c0d5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:39 +0100
Subject: [PATCH 16/19] synfig: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 30109541ec4fc..d4d3e341a20bf 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfigstudio' and 'ETL'
 pkgname=synfig
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="boost-build ImageMagick pkg-config intltool"

From 152d8c357c5f7a95ac71b2d4084241af73ec1f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 17/19] synfigstudio: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index af1c5a296ef0f..09e442da9a680 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -2,7 +2,7 @@
 # Should be kept in sync with 'synfig' and 'ETL'
 pkgname=synfigstudio
 version=1.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-update-mimedb"
 hostmakedepends="pkg-config intltool gettext synfig"

From a17de66bff01dfb052981faa4c6610e731459475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 18/19] vigra: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index 039c6c49a04a6..a0146228ae67f 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,7 +1,7 @@
 # Template file for 'vigra'
 pkgname=vigra
 version=1.11.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_OPENEXR=1"
 hostmakedepends="python3"

From adcf30e7e24a154f8a99750930c4945fd0a354bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 20 Oct 2023 19:28:40 +0100
Subject: [PATCH 19/19] vips: revbump for openexr 3.2.1.

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

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 6b08ed1088e38..53dee079ec882 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
 # Template file for 'vips'
 pkgname=vips
 version=8.14.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 # TODO: As of version 8.11 vips supports loading its support for OpenSlide,

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

* Re: [PR PATCH] [Merged]: openexr: update to 3.2.1.
  2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
                   ` (10 preceding siblings ...)
  2023-11-05 21:05 ` motorto
@ 2023-11-07 17:51 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2023-11-07 17:51 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

openexr: update to 3.2.1.
https://github.com/void-linux/void-packages/pull/46593

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
-  Cross build - aarch64

Disabling the tests for *-musl (https://github.com/AcademySoftwareFoundation/openexr/issues/1556)

Currently failing, because this templates are broken: 

- [x] hugin (fails because it needs vigra)
- [x] openimageio (checksum wrong, fixed)
- [x] vigra #46829 

<details>
  <summary>Build Status</summary>

```
SUMMARY
pkg            host    target  cross  result
openexr        x86_64  x86_64  n      OK
ImageMagick    x86_64  x86_64  n      OK
gimp           x86_64  x86_64  n      OK
opencv         x86_64  x86_64  n      OK
synfig         x86_64  x86_64  n      OK
libjxl         x86_64  x86_64  n      OK
vigra          x86_64  x86_64  n      OK
gmic           x86_64  x86_64  n      OK
openimageio    x86_64  x86_64  n      OK
vips           x86_64  x86_64  n      OK
synfigstudio   x86_64  x86_64  n      OK
swayimg        x86_64  x86_64  n      OK
libgdal        x86_64  x86_64  n      OK
krita          x86_64  x86_64  n      OK
kio-extras     x86_64  x86_64  n      OK
kimageformats  x86_64  x86_64  n      OK
hugin          x86_64  x86_64  n      OK
darktable      x86_64  x86_64  n      OK
blender        x86_64  x86_64  n      OK
```

```
SUMMARY
pkg            host    target   cross  result
openexr        x86_64  aarch64  y      OK
ImageMagick    x86_64  aarch64  y      OK
gimp           x86_64  aarch64  y      OK
opencv         x86_64  aarch64  y      OK
synfig         x86_64  aarch64  y      OK
libjxl         x86_64  aarch64  y      OK
vigra          x86_64  aarch64  y      OK
gmic           x86_64  aarch64  y      OK
openimageio    x86_64  aarch64  y      OK
vips           x86_64  aarch64  y      OK
synfigstudio   x86_64  aarch64  y      OK
swayimg        x86_64  aarch64  y      OK
libgdal        x86_64  aarch64  y      OK
krita          x86_64  aarch64  y      OK
kio-extras     x86_64  aarch64  y      OK
kimageformats  x86_64  aarch64  y      OK
hugin          x86_64  aarch64  y      OK
darktable      x86_64  aarch64  y      OK
blender        x86_64  aarch64  y      SKIPPED
```

</details>

[ci skip]

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

end of thread, other threads:[~2023-11-07 17:51 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-11 11:59 [PR PATCH] openexr: update to 3.2.1 motorto
2023-10-11 16:53 ` [PR PATCH] [Updated] " motorto
2023-10-20 15:15 ` motorto
2023-10-20 17:49 ` motorto
2023-10-20 18:29 ` motorto
2023-10-20 20:05 ` motorto
2023-10-21 13:31 ` motorto
2023-11-01 17:15 ` motorto
2023-11-04 21:00 ` motorto
2023-11-05 20:38 ` motorto
2023-11-05 20:52 ` motorto
2023-11-05 21:05 ` motorto
2023-11-07 17:51 ` [PR PATCH] [Merged]: " classabbyamp

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).