From 50695f9285979fe1dbd6f26388873718faf8a316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= 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 " 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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?= 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,