* Re: [PR PATCH] [Updated] openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
@ 2022-03-26 14:15 ` tibequadorian
2022-03-26 16:21 ` tibequadorian
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 14:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openimageio: update to 2.3.13.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 15939 bytes --]
From f332e27c19ed86eb4231a302e11e1a2666d00b93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 1/5] New package: Imath-3.1.4
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..dff140bd8867 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..1410ec01e959
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,26 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 36c61598b5ea0e0e26222c1c554dae2a75c34cc2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 2/5] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/fix-strtol.patch | 25 +++++
srcpkgs/opencolorio/template | 17 ++--
5 files changed, 34 insertions(+), 139 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/fix-strtol.patch
diff --git a/common/shlibs b/common/shlibs
index dff140bd8867..f6c1257b87fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/fix-strtol.patch b/srcpkgs/opencolorio/patches/fix-strtol.patch
new file mode 100644
index 000000000000..62d2e37699b6
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/fix-strtol.patch
@@ -0,0 +1,25 @@
+From 92dd35b9a15b5feae533e48310fdc1136b5a46c5 Mon Sep 17 00:00:00 2001
+From: Leon Marz <main@lmarz.org>
+Date: Sat, 18 Dec 2021 12:26:59 +0100
+Subject: [PATCH 2/2] fix strtol
+
+---
+ src/utils/NumberUtils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471..e3967b2 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -140,7 +140,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+ #else
+- tempval = ::strtol_l(first, &endptr, 0, loc.local);
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.34.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..3c5ddf982106 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,27 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF
+ -DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="tinyxml-devel lcms2-devel expat-devel Imath-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 821ae04451b03dc544b245d2b162dab044cfd513 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:36 +0100
Subject: [PATCH 3/5] krita: rebuild against opencolorio-2.1.1
---
srcpkgs/krita/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..326d49590256 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
From efdbd2308c17a418944c65b701f62bd91514b82b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 4/5] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f6c1257b87fe..03338db38b8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.1_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..07c2d05f8b65 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,12 +1,15 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
@@ -16,8 +19,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -34,6 +41,12 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +74,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 4ec875f761b63d80a0f3a2aab04929bc748cc418 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:51 +0100
Subject: [PATCH 5/5] blender: rebuild against openimageio-2.3.13.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
2022-03-26 14:15 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-26 16:21 ` tibequadorian
2022-03-26 17:07 ` biopsin
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openimageio: update to 2.3.13.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 16679 bytes --]
From f332e27c19ed86eb4231a302e11e1a2666d00b93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 1/5] New package: Imath-3.1.4
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..dff140bd8867 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..1410ec01e959
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,26 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From eead5c5103fa13f5e07a0bb54c36b6ded301adea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 2/5] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 17 ++--
5 files changed, 52 insertions(+), 139 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index dff140bd8867..f6c1257b87fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..3c5ddf982106 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,27 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF
+ -DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="tinyxml-devel lcms2-devel expat-devel Imath-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 483d1e0f65633bc691ec744fa7453d1e86e66f4d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:36 +0100
Subject: [PATCH 3/5] krita: rebuild against opencolorio-2.1.1
---
srcpkgs/krita/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..326d49590256 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
From f02a270cf53ab7c6d108e4b5a55f65464a58414b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 4/5] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f6c1257b87fe..03338db38b8a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.1_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..07c2d05f8b65 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,12 +1,15 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
@@ -16,8 +19,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -34,6 +41,12 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +74,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From cc6eeed4bc6cf8c325abe0d7b703690112857d02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:51 +0100
Subject: [PATCH 5/5] blender: rebuild against openimageio-2.3.13.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
2022-03-26 14:15 ` [PR PATCH] [Updated] " tibequadorian
2022-03-26 16:21 ` tibequadorian
@ 2022-03-26 17:07 ` biopsin
2022-03-26 17:39 ` tibequadorian
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: biopsin @ 2022-03-26 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by biopsin on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1079734647
Comment:
Might close issue #32012
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (2 preceding siblings ...)
2022-03-26 17:07 ` biopsin
@ 2022-03-26 17:39 ` tibequadorian
2022-03-26 18:26 ` tibequadorian
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1079740562
Comment:
Good to know it was already an issue. Sadly this is still the case.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (3 preceding siblings ...)
2022-03-26 17:39 ` tibequadorian
@ 2022-03-26 18:26 ` tibequadorian
2022-03-26 20:08 ` [PR PATCH] [Updated] " tibequadorian
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1079740562
Comment:
~Good to know it was already an issue. Sadly this is still the case.~
I'm not sure if this is the same issue but blender currently fails linking against openimageio as seen in CI logs for x86_64
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (4 preceding siblings ...)
2022-03-26 18:26 ` tibequadorian
@ 2022-03-26 20:08 ` tibequadorian
2022-03-26 20:28 ` tibequadorian
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openimageio: update to 2.3.13.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 14756 bytes --]
From c57c5d0d1eadb1ddf9bf9875391686e2fe47eb24 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 1/4] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 17 ++--
5 files changed, 52 insertions(+), 139 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..27cf4faf3380 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..77d185efc87e 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,27 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF
+ -DOCIO_USE_OPENEXR_HALF=ON"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel ilmbase-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 1c4079c647c82d12ce07981c5cb3d3750e52cdc2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:36 +0100
Subject: [PATCH 2/4] krita: rebuild against opencolorio-2.1.1
---
srcpkgs/krita/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..326d49590256 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
From f10c56c679b55f83e8989d6eee45dd6e11ecce71 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 3/4] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 27cf4faf3380..5340034f2eaf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.1_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..07c2d05f8b65 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,12 +1,15 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
@@ -16,8 +19,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -34,6 +41,12 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +74,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 62dd53c2304f006bb1db2d0cf4d885d806295396 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:51 +0100
Subject: [PATCH 4/4] blender: rebuild against openimageio-2.3.13.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (5 preceding siblings ...)
2022-03-26 20:08 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-26 20:28 ` tibequadorian
2022-03-27 14:09 ` tibequadorian
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-26 20:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openimageio: update to 2.3.13.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 14770 bytes --]
From c0b4477726bfdad8fdd0527f74e266acd9d6dbd3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 1/4] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 19 ++--
5 files changed, 53 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..27cf4faf3380 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..48241bd30380 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,27 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF
+ -DOCIO_USE_OPENEXR_HALF=ON"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel ilmbase-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 1dc78555faaad83d890945c36d4616f9ef433bde Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:36 +0100
Subject: [PATCH 2/4] krita: rebuild against opencolorio-2.1.1
---
srcpkgs/krita/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..326d49590256 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
From 9bb8508f0e57960ac203535216d1761e3dad8469 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 3/4] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 27cf4faf3380..5340034f2eaf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.1_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.1_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..07c2d05f8b65 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,12 +1,15 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
@@ -16,8 +19,12 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -34,6 +41,12 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +74,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 0e4ed466a90f948296c1a7d49755b93dba2e1648 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:29:51 +0100
Subject: [PATCH 4/4] blender: rebuild against openimageio-2.3.13.0
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openimageio: update to 2.3.13.0.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (6 preceding siblings ...)
2022-03-26 20:28 ` tibequadorian
@ 2022-03-27 14:09 ` tibequadorian
2022-03-27 17:26 ` openexr/Imath: update to 3.1.4 tibequadorian
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 14:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openimageio: update to 2.3.13.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 53881 bytes --]
From 57fdf4ae22de80d7e23d14563d20d2138ecd3189 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..dff140bd8867 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..0fa9b9c7e386
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 7207096756694d3675ec2f269b87220c3487e9be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From e84598384c2d5f56f03b08a579b14a10d1866af4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 54 ++++++-------------
6 files changed, 21 insertions(+), 74 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index dff140bd8867..442a7079f077 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,8 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..8b41f63c85c4 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,32 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-
-post_install() {
- local d f
-
- vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
-}
-
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From fdbec1d3878a579a413c08ec204ebf31bc1e5a3d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1, rebuild against
openexr-3.1.4.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 442a7079f077..64da11864f76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 9c6d3795188074ecc135dad1f4cbbb8f5c63f78c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..aa6482ad3501 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,12 +1,12 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
- glfw-devel libXxf86vm-devel jemalloc-devel"
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel zlib-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0"
From 41208af999a08a37d4cbbecee740ef4f2022758b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package, deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 4931f1f9509b7606d2a1a1a2c384bc677089b155 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0, rebuild against
openexr-3.1.4.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 31 +++++++++++++++++++++----------
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 64da11864f76..67b79bb955b3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..a857cd1e2803 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -34,6 +40,12 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +73,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 11eacecbdf84acbba25f6b0c45aedce288884ca7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3, rebuild against Imath-3.1.4.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 67b79bb955b3..c095bc943487 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3903,7 +3903,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From ad36844ef16a55453e076432fab9c16958f77c1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0, rebuild against
openexr-3.1.4.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From ef54626084e08d25a41eb72d37753a16dddf0983 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..f0d8923a8ef0 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
From ba10af23033c470abaf9d22287c045094275f245 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From fe316bd85f68677d84ae8ced1a483e33c0c33611 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From 18e058aeb0e5728e99b207669dcbe3374e267fa6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From ef271e83dc061e6f0e09c2e1a87c90abddac19ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From 095d385f0220d7ba28a70bd33cfc748d6bb3470b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From f96d8a59918dd50ef37b65bf565a674ca2c6596d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..f4e9e251d2fa 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
From f1a845655fe7d3c1ba23fff3df7571d0ac67ac85 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From d858da02993812a1a9960fa45d0d672c712a0723 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From cbc0f7f909d82f27bd56ac48071ccb4b32905514 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9ca0ead9739a 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 736c99d6c2b63a4fa50e9541147e2dee65aebab6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 80021cd549943293b26d41bd74425948a96025b2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From adc41d1f11df2678cb0de7c2b0eb0a292b2fc18a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 02298f7f66c4187b12a6ddad6e05a600e02cc1a2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From fecce1d8b1ed7179bc266fa80e1b2818973082f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency, not needed.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From a3a320649ccc47bf84d93ed8775a4dee7584cfda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr, not
needed.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From a81fd4dcc5f434367bbbdce98d147ec6ae3b2041 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 3eb62fa21cd52cbec3b9a276cd946bed17cb5f66 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..9258eda49706 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,13 +1,13 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
From 2b9ffbcecbe892b6bc9018940be1350ff20f2699 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (7 preceding siblings ...)
2022-03-27 14:09 ` tibequadorian
@ 2022-03-27 17:26 ` tibequadorian
2022-03-27 17:46 ` [PR PATCH] [Updated] " tibequadorian
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 17:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1079740562
Comment:
~Good to know it was already an issue. Sadly this is still the case.~
~I'm not sure if this is the same issue but blender currently fails linking against openimageio as seen in CI logs for x86_64~
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (8 preceding siblings ...)
2022-03-27 17:26 ` openexr/Imath: update to 3.1.4 tibequadorian
@ 2022-03-27 17:46 ` tibequadorian
2022-03-27 19:34 ` tibequadorian
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
??? builds fine but doesn't link against openexr:
- enblend-enfuse
- devil
- calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] Field3D
- [ ] openimageio (fails on aarch64*, armv7l*)
- [x] alembic
- [x] blender
- [x] gimp
- [ ] gmic
- [ ] darktable (fails on x86_64* because it depends on gmic)
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 53943 bytes --]
From 0db8ce26b1ba2a3b08f93cda06b972d8b846f4d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..dff140bd8867 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..0157c097cc15
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 454fb33114ab2efd57cf06455a715d18fb1abd18 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From 652fd0bc1af1337fb701391f9c1bc97c69dc0563 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index dff140bd8867..442a7079f077 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,8 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From e3c384441f2c1cfadab67ac563a509dca949ac37 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 442a7079f077..64da11864f76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From ce7a26fbd60458acbad68c47ea57f2b82357d1f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From c994d662b800ccd5fbc6974d267ffe697d727753 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 6e6975010c2b4134d3c4ace832df83836fd9ae0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 34 ++++++++++++++++++++++++----------
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 64da11864f76..67b79bb955b3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..6e7d748b693e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,12 +34,21 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
+}
+
pre_build() {
local f
# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
@@ -61,7 +76,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From ebe97f87a28fe0884c8a764e4004eeac3546f1b8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 67b79bb955b3..c095bc943487 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3903,7 +3903,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 2f8c1b954fad19425f17f3ad449056821584b429 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From 84bcda9ce9774d48ecf57a8d732f95c210a46f47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..f0d8923a8ef0 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
From d1ed7ea5c6d42a88bda9ffd99e3ee1deac4f75d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From fbf8e827eb9724bf85efe3dfa86880bda73a2fab Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From e2685ce2561f9bd176b35213626678c555bf1e55 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 2800dc5ec008592fad53acf2ba41f3c9dc193ab6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From 39a1f4c8e45520a3b187ec3331380c9574a74b5d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 18991d54b6973d600c4d41dbdd1c83132667cf53 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..f4e9e251d2fa 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
From 6772f5ee30d22a4b0f0b181d2f5901a715a3d277 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From aa07bf363a26671f8c2b470545c0507428c95899 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 93e25b9b2619591759a4c447b82cb8f6c003e2e9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9ca0ead9739a 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 177f37d3438ce32eab92a6f472a1307f3c9d7609 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 6b23e4e09c8032bc5477c72ed85e7ac998383339 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9ddb6ef2e7b443ce9c27c230a85ce9029143dfd1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From df980ccf01f542bfa7542744f8003a54418be899 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From 376b8904fbe2e54a0fbd197a7b381665e123456f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed it.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From e5ae9b0c2d3880294a8c8bad7d3fdfd67e6bf043 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 58d2866f4488e5ee3c020c6ffd5a1c913db35c4a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From d17c616e47f22e1ef25c9340d09ae89a46e22a20 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..9258eda49706 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,13 +1,13 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
From 25bf6f489bb7c00303857378552942cdee280694 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (9 preceding siblings ...)
2022-03-27 17:46 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-27 19:34 ` tibequadorian
2022-03-27 22:13 ` tibequadorian
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds fine but doesn't link against openexr:
- enblend-enfuse
- devil
- calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] Field3D
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [ ] gmic
- [ ] darktable (depends on gmic on nocross targets)
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 54398 bytes --]
From 8260c2278d53a4768be57282598bdf4a982f7323 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index bba46e1678dc..8e5248da8c33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..0157c097cc15
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 7bfb7bdc0a36b85cd9bbcfb765ae97956b9dfa1b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From e70629021ced671e0cb790e42e6ca4d92b8e70cd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 8e5248da8c33..8a6a71f7934f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,8 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From f24b10ce68f61e269e994ca07b85a2b3ec9536d6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 8a6a71f7934f..d9fe09dddc33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 612c30a3063637ef8ae97a67362af19d5a80b6c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2bddd4a99839301d691e22c42e74cb1378f3aabc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 25c92057f743c5b9b524778584cf80cbcc16f3f1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 46 +++++++++++++++++-------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d9fe09dddc33..5c291160e6e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..3c7babcf5338 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,19 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +60,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 315e3f30781c95c250260824438542bae04248fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5c291160e6e8..0dce87e7bca3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 4777452f431701977c39eb724b92e2716e7bfbeb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From ab7559fd4c0e141dce28eb2b21ef1a7de96d8fca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..f0d8923a8ef0 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
From b82fc7ebd79b073ff1d7afc6331e3084779de09d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 03fc3d813ec8d7ca29b7a4b4f2d3740762281976 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From d2d2b8c16c61d72200c49cc295dab0ecb6719e3b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From f6d5adc23b22d27cbf2181dacf139e945a364ca5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From b2c9b50cc449a61f4cbb8e9e1ffe2806f8a0fc16 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From dd5ee3da0b19a67790f4c39bd61afc8c94525123 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..f4e9e251d2fa 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
From 3e0b5c3abdcc9a1c4178a7e39b3fb5152fb76d09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 487af41c8a221ea2c1c95145763724cbfced4fa6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From b4ecd9ca084966e36712dd434081c41450e54a94 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9ca0ead9739a 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 9580d71200d5ee2d5a9d24ea96ea2c62d18b58a8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From c2a71f37c2a220cb8235e4f597d12fcac511eb6d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 28cc2e707fc95629f8d9644af850cb9ae66bb6ad Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 2c84df3d7863fb0b7225537bcdaf72ac34b05b47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From 8f72fc2904cc43e894ec7b8b81f5159ab25f2be3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed it.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From f5e4f3a44d2e09f34a682ce5c9d9ae53e5fdbade Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 8c2401260606e65530b3147ac2c6f79a8e7147d5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From cf9decc6fbecccf6fc87bf7a9e97e376f4133f58 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..9258eda49706 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,13 +1,13 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
From 7d012f675acd378668497ddd94ea5d9a53518245 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (10 preceding siblings ...)
2022-03-27 19:34 ` tibequadorian
@ 2022-03-27 22:13 ` tibequadorian
2022-03-27 22:24 ` tibequadorian
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 22:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- enblend-enfuse
- devil
- calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] Field3D
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [ ] gmic
- [ ] darktable (depends on gmic for nocross targets)
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 55306 bytes --]
From 692611265bf05c2268b6926df0a0aa77e11229e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 1b072c738a2e..4f33d2644cf2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..0157c097cc15
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 64bc983988ce5db674d28406962bf6fdae922552 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From 240b14b8abaed32b09ae6e26cd86b975b3f30c01 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 4f33d2644cf2..2302dc8828c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,8 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 843b9f4b7ebf1c44f9b2afc4711552051efcc60f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 2302dc8828c3..2f9a0f635511 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 6139b45da3b9602212fe35d491f9e3725483b10f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6f0e83e37d15bb3effc86002cd975e6b25bfd29e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 31ec98af803bf60b13185965ae2dfc557750c827 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 46 +++++++++++++++++-------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2f9a0f635511..e617971d9251 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..3c7babcf5338 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,19 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +60,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 32eb4cea5c69adda9d886da63b41b51282bb4c9c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e617971d9251..3d5d6609e0aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 74b09f3335ca863f0a0c9b922d63c8cb781780b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From f8da469b00061d54f4f97b69324d330abefa517b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..f0d8923a8ef0 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
From 11dd961b9742f83589a93879b2b5b217725e493c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From a00c5025e5b52c33b1618fe4f339291ca6a9d6a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From dcd1951467bb19ac5a211219a17587095b0aff61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From fb5af994c4e86bd4275eaeac0752e067f177e78a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From d22effc6985b39bd63def71f1af29ef16884ea4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 7da0d8b4dc5ba8465f285b62a598896dda0c24c6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..f4e9e251d2fa 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
From b937a8365a7aac2870c39a99d22d8e939e8f83e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 773861d210b67da7bebff848a5a422ab5e2541bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 14e6dfc26b6c1894303933a2b58dc784adfebfc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9ca0ead9739a 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From bdf562e6ecf642e797ea853fd1f3c9a18f92b076 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From df69c73c0d937510292bdc3b52f07783089a6ab1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 500c9408e97dab0c68cc8e5cfed68c9016bce1e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 50dbcb5a31ecad2a1724d3c9ca259be9a35745b0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From 11e973a10f5efe37ffe1dfbb0e121571976fa23a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed it.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From ae1278c494602ee6cada242db76bc3d6343e89b1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 4a9486aec8eaec77f5db6c43c54ae083149d93c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 6b3ab0f2e3d2338e9afef21d2744f53fc1490d40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..9258eda49706 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,13 +1,13 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
From 0a55110795bdab5e265cb7122646c29054f24fbc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (11 preceding siblings ...)
2022-03-27 22:13 ` tibequadorian
@ 2022-03-27 22:24 ` tibequadorian
2022-03-27 23:59 ` tibequadorian
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [ ] calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] Field3D
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [ ] gmic
- [ ] darktable (depends on gmic for nocross targets)
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 55384 bytes --]
From 692611265bf05c2268b6926df0a0aa77e11229e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index 1b072c738a2e..4f33d2644cf2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..0157c097cc15
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 64bc983988ce5db674d28406962bf6fdae922552 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From 240b14b8abaed32b09ae6e26cd86b975b3f30c01 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 4f33d2644cf2..2302dc8828c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,8 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 843b9f4b7ebf1c44f9b2afc4711552051efcc60f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 2302dc8828c3..2f9a0f635511 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 6139b45da3b9602212fe35d491f9e3725483b10f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6f0e83e37d15bb3effc86002cd975e6b25bfd29e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From 31ec98af803bf60b13185965ae2dfc557750c827 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 ++--
srcpkgs/openimageio/template | 46 +++++++++++++++++-------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2f9a0f635511..e617971d9251 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..3c7babcf5338 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
-DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,19 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
fi
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +60,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 32eb4cea5c69adda9d886da63b41b51282bb4c9c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e617971d9251..3d5d6609e0aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 74b09f3335ca863f0a0c9b922d63c8cb781780b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From f8da469b00061d54f4f97b69324d330abefa517b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..f0d8923a8ef0 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
From 11dd961b9742f83589a93879b2b5b217725e493c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From a00c5025e5b52c33b1618fe4f339291ca6a9d6a0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From dcd1951467bb19ac5a211219a17587095b0aff61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From fb5af994c4e86bd4275eaeac0752e067f177e78a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From d22effc6985b39bd63def71f1af29ef16884ea4b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 7da0d8b4dc5ba8465f285b62a598896dda0c24c6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..f4e9e251d2fa 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
From b937a8365a7aac2870c39a99d22d8e939e8f83e4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 773861d210b67da7bebff848a5a422ab5e2541bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 14e6dfc26b6c1894303933a2b58dc784adfebfc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..9ca0ead9739a 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From bdf562e6ecf642e797ea853fd1f3c9a18f92b076 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From df69c73c0d937510292bdc3b52f07783089a6ab1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 500c9408e97dab0c68cc8e5cfed68c9016bce1e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 50dbcb5a31ecad2a1724d3c9ca259be9a35745b0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From 11e973a10f5efe37ffe1dfbb0e121571976fa23a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed it.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 4459853d73b816c4a81a4136d301b3d86a8c3c03 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 2f74600f9610840307ca07af22003d87bc0e0749 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 13c70d89db24da77c8eef0d698dc724624f44313 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..9258eda49706 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,13 +1,13 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1"
From c03bd25ba03f50085cdb308ba0e99f69c4ba6418 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (12 preceding siblings ...)
2022-03-27 22:24 ` tibequadorian
@ 2022-03-27 23:59 ` tibequadorian
2022-03-28 12:22 ` [PR PATCH] [Updated] " tibequadorian
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-27 23:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1079740562
Comment:
~Good to know it was already an issue. Sadly this is still the case.~
~I'm not sure if this is the same issue but blender currently fails linking against openimageio as seen in CI logs for x86_64~
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (13 preceding siblings ...)
2022-03-27 23:59 ` tibequadorian
@ 2022-03-28 12:22 ` tibequadorian
2022-03-28 12:54 ` tibequadorian
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-28 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [ ] calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [x] gmic
- [x] darktable
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 56717 bytes --]
From 6d5a2cc9878fd4e159013da99c5a7d85bc08a22b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..44b355a401ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..3abba92aa8a8
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 761928a973bd4ce0a5e6ce0e2a5819e26d587406 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a016760487fce453eb4917c4ecab7f27e356f5d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 44b355a401ce..60baa98a75de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4146,3 +4146,8 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 0947163aab7cc314cccb14fe5bca3afd128d304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 60baa98a75de..5824743a6c79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 5dd60d793ede10ee799c4eb6f7ff97c7969ee6be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 27b085581bcd94bc7b82618f1bf618c5985d1a8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From dd423a99d37ed7826db634fcd5072580fc1ffbfa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 52 ++++++++++++++++--------------------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5824743a6c79..8e4518139a92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ec407cb944f3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From e0e3f88859a3dc569763c16c9676cfbeb441a3fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8e4518139a92..307102832ebd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 6e9f3b68c30f44fac04b2ede874bd10a04c6f64d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From bd57a41b29e267640cc73888aec96bd959d45951 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..3ab8c6490e8f 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From a41b5a5b5e7144d9c64dd29f60574c73d4a4c5a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 36784e40e6d7cb9cf4d1d4c21a93a903bc1829d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From f732b13baf1717289eb718d6edbcffb0938e4879 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 375a52ed7a6297fe563500531e0646a65030b96b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From fd84b666aef72d3b4ac0b3f31225133862a94890 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 4b2020338d411146b9ce66cfdcfdc87f374bc002 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..7ac42e58d1b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 6e2228e81cd9873be65dd6593833d96bc2640c02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 9221da26cf1a8d26a10083c0338b599eac7cef60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 067b9c72e3234af939fb1b9baccbae9140e1de34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..d37f308403da 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,14 +12,14 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 02e06141b1073bc89f33e6c62eaf3ae83974b2e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 5239b30f6587527bf5aa943131429b4d0fc2ed3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9bd7c14bd6b051bb7f60debc699e162f56326437 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 5b6852923ede6f6f3199517557d86719ca0dc0c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From dd3495da571f28278cec500616038d8070306310 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 7aaa520612535f5ed5af1417d2e9abb17ac05300 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was firstly added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From be8539a80866d7f0681a0a3ad7336eddf623cbfd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 173ddc4b8079621ff982f913dbeac9f5ef9eca7d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..191989aff4d1 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,16 +1,16 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 785d1f4b9a36e22f861a020c0f3cf6daee5779d4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (14 preceding siblings ...)
2022-03-28 12:22 ` [PR PATCH] [Updated] " tibequadorian
@ 2022-03-28 12:54 ` tibequadorian
2022-03-28 19:03 ` tibequadorian
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-28 12:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [ ] calligra
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [x] gmic
- [x] darktable
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 56715 bytes --]
From 6d5a2cc9878fd4e159013da99c5a7d85bc08a22b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..44b355a401ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..3abba92aa8a8
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 761928a973bd4ce0a5e6ce0e2a5819e26d587406 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a016760487fce453eb4917c4ecab7f27e356f5d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 44b355a401ce..60baa98a75de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4146,3 +4146,8 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 0947163aab7cc314cccb14fe5bca3afd128d304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 60baa98a75de..5824743a6c79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 5dd60d793ede10ee799c4eb6f7ff97c7969ee6be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 27b085581bcd94bc7b82618f1bf618c5985d1a8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From dd423a99d37ed7826db634fcd5072580fc1ffbfa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 52 ++++++++++++++++--------------------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5824743a6c79..8e4518139a92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ec407cb944f3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From e0e3f88859a3dc569763c16c9676cfbeb441a3fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8e4518139a92..307102832ebd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 6e9f3b68c30f44fac04b2ede874bd10a04c6f64d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From bd57a41b29e267640cc73888aec96bd959d45951 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..3ab8c6490e8f 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From a41b5a5b5e7144d9c64dd29f60574c73d4a4c5a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 36784e40e6d7cb9cf4d1d4c21a93a903bc1829d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From f732b13baf1717289eb718d6edbcffb0938e4879 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 375a52ed7a6297fe563500531e0646a65030b96b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From fd84b666aef72d3b4ac0b3f31225133862a94890 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 4b2020338d411146b9ce66cfdcfdc87f374bc002 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..7ac42e58d1b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 6e2228e81cd9873be65dd6593833d96bc2640c02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 9221da26cf1a8d26a10083c0338b599eac7cef60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 067b9c72e3234af939fb1b9baccbae9140e1de34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..d37f308403da 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,14 +12,14 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 02e06141b1073bc89f33e6c62eaf3ae83974b2e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 5239b30f6587527bf5aa943131429b4d0fc2ed3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9bd7c14bd6b051bb7f60debc699e162f56326437 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 5b6852923ede6f6f3199517557d86719ca0dc0c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From dd3495da571f28278cec500616038d8070306310 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 0fed9cab8f2ebb31b3a81fcd616ea4458a0f7760 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 573d182283add4bed956e004afca94e470c494a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: rebuild against openexr
---
srcpkgs/calligra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..c3b178538bb8 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 0c509106f34402b40f565d80b1459012826927ae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..191989aff4d1 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,16 +1,16 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 178d10e20ec446d46d0cdf14e54f6c3127970342 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (15 preceding siblings ...)
2022-03-28 12:54 ` tibequadorian
@ 2022-03-28 19:03 ` tibequadorian
2022-03-28 22:17 ` tibequadorian
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-28 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [x] calligra
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [x] gmic
- [x] darktable
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 60151 bytes --]
From 6d5a2cc9878fd4e159013da99c5a7d85bc08a22b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..44b355a401ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..3abba92aa8a8
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 761928a973bd4ce0a5e6ce0e2a5819e26d587406 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a016760487fce453eb4917c4ecab7f27e356f5d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 44b355a401ce..60baa98a75de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4146,3 +4146,8 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 0947163aab7cc314cccb14fe5bca3afd128d304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 60baa98a75de..5824743a6c79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 5dd60d793ede10ee799c4eb6f7ff97c7969ee6be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 27b085581bcd94bc7b82618f1bf618c5985d1a8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From dd423a99d37ed7826db634fcd5072580fc1ffbfa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 52 ++++++++++++++++--------------------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5824743a6c79..8e4518139a92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ec407cb944f3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From e0e3f88859a3dc569763c16c9676cfbeb441a3fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8e4518139a92..307102832ebd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 6e9f3b68c30f44fac04b2ede874bd10a04c6f64d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From bd57a41b29e267640cc73888aec96bd959d45951 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..3ab8c6490e8f 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From a41b5a5b5e7144d9c64dd29f60574c73d4a4c5a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 36784e40e6d7cb9cf4d1d4c21a93a903bc1829d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From f732b13baf1717289eb718d6edbcffb0938e4879 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 375a52ed7a6297fe563500531e0646a65030b96b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From fd84b666aef72d3b4ac0b3f31225133862a94890 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 4b2020338d411146b9ce66cfdcfdc87f374bc002 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..7ac42e58d1b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 6e2228e81cd9873be65dd6593833d96bc2640c02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 9221da26cf1a8d26a10083c0338b599eac7cef60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 067b9c72e3234af939fb1b9baccbae9140e1de34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..d37f308403da 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,14 +12,14 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 02e06141b1073bc89f33e6c62eaf3ae83974b2e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 5239b30f6587527bf5aa943131429b4d0fc2ed3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9bd7c14bd6b051bb7f60debc699e162f56326437 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 5b6852923ede6f6f3199517557d86719ca0dc0c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From dd3495da571f28278cec500616038d8070306310 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 0fed9cab8f2ebb31b3a81fcd616ea4458a0f7760 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From dccd4db480b973abca52e22a0cce9d9efc23e862 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: patch for OpenEXR 3
---
srcpkgs/calligra/patches/openexr3.patch | 93 +++++++++++++++++++++++++
srcpkgs/calligra/template | 2 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/openexr3.patch
diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+--
+GitLab
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..9f8c3f7d7df0 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 2e756ce4df7810e889b940be6a289dc630fc9d6c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: rebuild against openexr
---
srcpkgs/devil/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..191989aff4d1 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,16 +1,16 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel openexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 7235f601954a52715dff5aff03f1a29bb724e258 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rebuild against openexr
---
srcpkgs/enblend-enfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..6f8d7cfba7d8 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,12 +1,12 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (16 preceding siblings ...)
2022-03-28 19:03 ` tibequadorian
@ 2022-03-28 22:17 ` tibequadorian
2022-03-28 22:25 ` tibequadorian
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-28 22:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [x] calligra
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [x] gmic
- [x] darktable
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 59979 bytes --]
From 6d5a2cc9878fd4e159013da99c5a7d85bc08a22b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..44b355a401ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..3abba92aa8a8
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 761928a973bd4ce0a5e6ce0e2a5819e26d587406 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
5 files changed, 74 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a016760487fce453eb4917c4ecab7f27e356f5d0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 5 ++
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 70 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 44b355a401ce..60baa98a75de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4146,3 +4146,8 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 0947163aab7cc314cccb14fe5bca3afd128d304f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index 60baa98a75de..5824743a6c79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 5dd60d793ede10ee799c4eb6f7ff97c7969ee6be Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 27b085581bcd94bc7b82618f1bf618c5985d1a8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From dd423a99d37ed7826db634fcd5072580fc1ffbfa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 52 ++++++++++++++++--------------------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5824743a6c79..8e4518139a92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ec407cb944f3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From e0e3f88859a3dc569763c16c9676cfbeb441a3fa Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8e4518139a92..307102832ebd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 6e9f3b68c30f44fac04b2ede874bd10a04c6f64d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From bd57a41b29e267640cc73888aec96bd959d45951 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..3ab8c6490e8f 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From a41b5a5b5e7144d9c64dd29f60574c73d4a4c5a5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 36784e40e6d7cb9cf4d1d4c21a93a903bc1829d9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From f732b13baf1717289eb718d6edbcffb0938e4879 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 375a52ed7a6297fe563500531e0646a65030b96b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From fd84b666aef72d3b4ac0b3f31225133862a94890 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 4b2020338d411146b9ce66cfdcfdc87f374bc002 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..7ac42e58d1b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 6e2228e81cd9873be65dd6593833d96bc2640c02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 9221da26cf1a8d26a10083c0338b599eac7cef60 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 067b9c72e3234af939fb1b9baccbae9140e1de34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..d37f308403da 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,14 +12,14 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 02e06141b1073bc89f33e6c62eaf3ae83974b2e5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From 5239b30f6587527bf5aa943131429b4d0fc2ed3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 9bd7c14bd6b051bb7f60debc699e162f56326437 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 5b6852923ede6f6f3199517557d86719ca0dc0c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From dd3495da571f28278cec500616038d8070306310 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 0fed9cab8f2ebb31b3a81fcd616ea4458a0f7760 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From eacfad1ac746bfbf3f3b1a2780438d70d92c455f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: patch for OpenEXR 3.
---
srcpkgs/calligra/patches/openexr3.patch | 93 +++++++++++++++++++++++++
srcpkgs/calligra/template | 2 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/openexr3.patch
diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+--
+GitLab
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..9f8c3f7d7df0 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 72ca4213acab87063a86860264794656f5a6e308 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: remove openexr build dependency.
OpenEXR is not found by cmake.
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..aa94331613ac 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -7,10 +7,10 @@ build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 40c5836fdefdf736f6334408b0f71348218758c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rename openexr build dependency.
---
srcpkgs/enblend-enfuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..ffb8e89bac4b 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (17 preceding siblings ...)
2022-03-28 22:17 ` tibequadorian
@ 2022-03-28 22:25 ` tibequadorian
2022-04-15 14:58 ` tibequadorian
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-03-28 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
#### Also updated:
- openimageio: update to 2.3.13.0
- opencolorio: update to 2.1.1
- alembic: update to 1.8.3
- blender: update to 3.1.0
#### Removed openexr support for now:
- vigra https://github.com/ukoethe/vigra/issues/496
- osg https://github.com/openscenegraph/OpenSceneGraph/issues/1075
#### Needs investigation? Builds successfully but doesn't link against openexr:
- [ ] enblend-enfuse
- [ ] devil
- [x] calligra
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
[ci skip]
#### Local build testing (x86_64, i686, aarch64, armv7l, x86_64-musl, armv6l-musl, aarch64-musl)
- [x] Imath
- [x] openexr
- [x] opencolorio
- [x] openvdb
- [x] openimageio
- [x] alembic
- [x] blender
- [x] gimp
- [x] gmic
- [x] darktable
- [x] hugin
- [x] kimageformats
- [x] kio-extras
- [x] krita
- [x] opencv
- [x] opencv4
- [x] osg
- [x] synfig
- [x] synfigstudio
- [x] vigra
- [x] embree
- [x] libgdal
- [x] calligra
- [x] devil
- [x] enblend-refuse
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 62062 bytes --]
From 6d5a2cc9878fd4e159013da99c5a7d85bc08a22b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/28] New package: Imath-3.1.4.
---
common/shlibs | 1 +
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 +++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..44b355a401ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
+libImath-3_1.so.29 Imath-3.1.4_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..3abba92aa8a8
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.4
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+# https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From b2ebf34c11c07b622b98512dcc9e8588fd1bafa3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:59:39 +0100
Subject: [PATCH 02/28] ilmbase: remove package, replaced by Imath.
---
common/shlibs | 5 ---
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
srcpkgs/removed-packages/template | 1 +
7 files changed, 1 insertion(+), 79 deletions(-)
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index 44b355a401ce..479efc4aa640 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,11 +1677,6 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..932cc54ffa3b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -194,6 +194,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
isl16<=0.16_2
js<=1.8.5_11
From ac3a8e4d080f9157edb6892adce550d32387e618 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 03/28] openexr: update to 3.1.4.
---
common/shlibs | 7 ++-
srcpkgs/{libopenexr => openexr-devel} | 0
srcpkgs/{libopenexr-devel => openexr-tools} | 0
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 --------
.../openexr/patches/pkgconfig-prefix.patch | 15 ------
srcpkgs/openexr/template | 50 ++++++-------------
6 files changed, 21 insertions(+), 72 deletions(-)
rename srcpkgs/{libopenexr => openexr-devel} (100%)
rename srcpkgs/{libopenexr-devel => openexr-tools} (100%)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 479efc4aa640..d83fcc1fb89d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,8 +1677,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
@@ -4141,3 +4139,8 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libImath-3_1.so.29 Imath-3.1.4_1
+libOpenEXRUtil-3_1.so.30 openexr-3.1.4_1
+libOpenEXRCore-3_1.so.30 openexr-3.1.4_1
+libOpenEXR-3_1.so.30 openexr-3.1.4_1
+libIlmThread-3_1.so.30 openexr-3.1.4_1
+libIex-3_1.so.30 openexr-3.1.4_1
diff --git a/srcpkgs/libopenexr b/srcpkgs/openexr-devel
similarity index 100%
rename from srcpkgs/libopenexr
rename to srcpkgs/openexr-devel
diff --git a/srcpkgs/libopenexr-devel b/srcpkgs/openexr-tools
similarity index 100%
rename from srcpkgs/libopenexr-devel
rename to srcpkgs/openexr-tools
diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..63352acb9782 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,54 +1,36 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.4
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=cb019c3c69ada47fe340f7fa6c8b863ca0515804dc60bdb25c942c1da886930b
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
-libopenexr_package() {
- short_desc+=" - runtime libraries"
+openexr-tools_package() {
+ short_desc+=" - tools"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
- vmove "usr/lib/*.so.*"
+ vmove usr/bin
}
}
-libopenexr-devel_package() {
+
+openexr-devel_package() {
short_desc+=" - development files"
- depends="${makedepends} libopenexr>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 5fab03614b9e5617fdf0b231d4028ac3f247429f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 04/28] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index d83fcc1fb89d..c2c3f5bbfcf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2220,7 +2220,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..657cf3bdf9a8 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel openexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 1792ca151ef5c38c9168b21dc727ef8f61588b31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 05/28] openvdb: rebuild against openexr-3.1.4.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..e3fcb8e916a9 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel openexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From bcfbe020c2de36732c81edf9ad4f97239bb7f538 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 06/28] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 932cc54ffa3b..a79bd0ee6bcd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -9,6 +9,7 @@ license="Public Domain"
homepage="https://voidlinux.org"
replaces="
+ Field3D<=1.7.3_2
ImageMagick6<=6.9.12.12_2
MoinMoin<=1.9.11_1
Platinum9-theme<=0.0.0.20170720_3
From 24d89cee48401d6ed01fc6f209244aea8d6449d1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 07/28] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 52 ++++++++++++++++--------------------
2 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2c3f5bbfcf3..f371f0ac4054 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2218,8 +2218,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ec407cb944f3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
- libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ libjpeg-turbo-devel tiff-devel libpng-devel openexr-devel Imath-devel freetype-devel
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From 492cf9ea6bd6d08f4d0c6bdbc88c2174b54ae12d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 08/28] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f371f0ac4054..f8ec7bb78179 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From d4ab8c3b69875993e29018b675fa16391c47c71c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/28] blender: update to 3.1.0.
---
srcpkgs/blender/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..0c792e7e6761 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.0
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -16,7 +16,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
- libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
+ openexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
opencolorio-devel opencollada-devel python3-numpy libXrender-devel
OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
pugixml-devel libXxf86vm-devel"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=1c26d3d33cfbd4456502b0687a08c4d1c13abf87c74a6f1ba7067df6973904b4
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From 1cf86f62e8ae88ca5576c32096467c72b5d7ba8f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/28] gimp: rebuild against openexr-3.1.4.
---
srcpkgs/gimp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..3ab8c6490e8f 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -9,7 +9,7 @@ hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
- libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
+ openexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From 40955a9b1f18aab345f0600d16fd47d705bc44cd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/28] gmic: rebuild against openexr-3.1.4.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..39d8e902b759 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel openexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 5662cd1ed35e4887351859e37ca6bc8540f98194 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/28] darktable: rebuild against openexr-3.1.4.
---
srcpkgs/darktable/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..e929bd7a0e08 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config intltool libxslt-devel desktop-file-utils"
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua54-devel json-glib-devel
- libgomp-devel libopenjpeg2-devel libopenexr-devel libgraphicsmagick-devel
+ libgomp-devel libopenjpeg2-devel openexr-devel libgraphicsmagick-devel
libsecret-devel pugixml-devel libosmgpsmap-devel colord-gtk-devel
libheif-devel portmidi-devel $(vopt_if gmic gmic-devel)
$(vopt_if avif libavif-devel) $(vopt_if sdl2 SDL2-devel)"
From 9c157139333ba0ac9051850a0297cba881694ef3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/28] hugin: rebuild against openexr-3.1.4.
---
srcpkgs/hugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..aab85fbcccca 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,13 +1,13 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
-makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
+makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel openexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
From 76a9297ea2ed5da6be45448eece93b48a03525b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 14/28] kimageformats: rebuild against openexr-3.1.4.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..bd5aefad57ab 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.91.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel"
+makedepends="karchive-devel openexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From fe2fa732c7265239b6dd17146335621221b3a235 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/28] kio-extras: rebuild against openexr-3.1.4.
---
srcpkgs/kio-extras/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..94c05aadb978 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,14 +1,14 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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
KDSoap-devel kdoctools kcoreaddons kio gettext"
makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel
kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel
- syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel
+ syntax-highlighting-devel openexr-devel samba-devel taglib-devel
KDSoap-devel ksolid-devel"
short_desc="Additional KIO components"
maintainer="Denis Revin <denis.revin@gmail.com>"
From effb5b74da0df2efa97b931af3fd14dc58ec4248 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/28] krita: rebuild against openexr-3.1.4.
---
srcpkgs/krita/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..7ac42e58d1b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -11,7 +11,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
kwindowsystem-devel kio-devel kcrash-devel qt5-svg-devel qt5-multimedia-devel
boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
- opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
+ opencolorio-devel eigen exiv2-devel libXi-devel openexr-devel libgomp-devel
poppler-qt5-devel giflib-devel python3-devel python3-PyQt5
python3-PyQt5-devel quazip-devel libheif-devel seexpr-krita-devel
libopenjpeg2-devel qt5-plugin-mysql qt5-plugin-sqlite qt5-plugin-odbc
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 1e88ad2d27e06aa24a6d9db934245e5c87b0b25a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/28] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 519c83894462cd3a90240750644063656ea22d7a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/28] opencv4: rebuild against openexr-3.1.4.
---
srcpkgs/opencv4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..7b6146d284f9 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@@ -13,7 +13,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel openexr-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library, version 4.x"
From 088db3521c13d91aabf4ee92edb85d294a812b28 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/28] osg: disable openexr support.
---
srcpkgs/osg/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..d37f308403da 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -12,14 +12,14 @@ hostmakedepends="pkg-config unzip xrandr"
makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel
jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg-devel xine-lib-devel
SDL2-devel gst-plugins-base1-devel
- $(vopt_if openexr libopenexr-devel)
+ $(vopt_if openexr openexr-devel)
$(vopt_if poppler poppler-glib-devel)
$(vopt_if qt qt5-devel)
$(vopt_if vnc libvncserver-devel)"
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 100796e99586ecad87c38db6d4c5cec4b5650135 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 20/28] synfig: rebuild against openexr-3.1.4.
---
srcpkgs/synfig/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..3550ae65c92e 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,12 +1,12 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
makedepends="ETL gettext-devel libxml++-devel mlt-devel libmagick-devel
- libmng-devel boost-build boost-devel libopenexr-devel ffmpeg-devel"
+ libmng-devel boost-build boost-devel openexr-devel ffmpeg-devel"
depends="ImageMagick"
short_desc="CLI 2D vector and timeline-based animation software"
maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -19,7 +19,7 @@ CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
synfig-devel_package() {
depends="${sourcepkg}>=${version}_${revision}
- libopenexr-devel libxml++-devel mlt-devel"
+ openexr-devel libxml++-devel mlt-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/synfig-config
From fbd16a9a6f5a772790b06a31e6130270df811272 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/28] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 52bd746a713d1b2a48ac1081c9bca9ca55223257 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/28] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From cba6fa304c590037e668488f3a7405caae8b2260 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 23/28] vips: rebuild against openexr-3.1.4.
---
srcpkgs/vips/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..cb0e921e458c 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
@@ -30,7 +30,7 @@ makedepends="
libheif-devel
libimagequant-devel
libjpeg-turbo-devel
- libopenexr-devel
+ openexr-devel
libpng-devel
librsvg-devel
libwebp-devel
From a9cec4d85c561f3efff61f4ebb98e1f087c87fe5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/28] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 430f173bfb29f1c6711467c20f21e5181337072c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 25/28] libgdal: remove openexr build dependency.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 753df422a697c3ad09b9d803f19675e24d91bc5e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 26/28] calligra: patch for OpenEXR 3.
---
srcpkgs/calligra/patches/openexr3.patch | 93 +++++++++++++++++++++++++
srcpkgs/calligra/template | 2 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/openexr3.patch
diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+--
+GitLab
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..9f8c3f7d7df0 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -11,7 +11,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
- libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
+ openexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
ktextwidgets-devel kservice-devel kcrash-devel"
From 79ac931253636439d8316187c4cf4f2a697d0948 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 27/28] devil: remove openexr build dependency.
OpenEXR is not found by cmake.
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..aa94331613ac 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -7,10 +7,10 @@ build_wrksrc="DevIL"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
- glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
+ glew-devel libfreeglut-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 06233b3b9a2e7b018a6ceac0d5cbde8ec59b0165 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 28/28] enblend-enfuse: rename openexr build dependency.
---
srcpkgs/enblend-enfuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..ffb8e89bac4b 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel gperftools
- gsl-devel lcms2-devel libopenexr-devel vigra-devel libgomp-devel"
+ gsl-devel lcms2-devel openexr-devel vigra-devel libgomp-devel"
short_desc="Tools for for combining multiple images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.4.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (18 preceding siblings ...)
2022-03-28 22:25 ` tibequadorian
@ 2022-04-15 14:58 ` tibequadorian
2022-04-15 15:15 ` [PR PATCH] [Updated] openexr/Imath: update to 3.1.5 tibequadorian
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-04-15 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2118 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.4.
### Changed templates:
#### New:
- Imath: 3.1.4
#### Updated:
- openexr: 2.4.1 -> 3.1.4, renamed libopenexr(-devel) -> openexr(-devel) and openexr -> openexr-tools
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.0
#### Removed:
- ilmbase: replaced by Imath
- Field3D: deprecated in blender and no longer used
#### Rebuild (based on `xrevshlib`):
- openvdb
- gimp
- gmic - patched
- darktable
- hugin
- kimageformats
- kio-extras
- krita
- opencv - removed openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disabled openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disabled openexr support for now: https://github.com/ukoethe/vigra/issues/496
- embree - removed openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - removed openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
#### Otherwise changed, no rebuild needed:
- enblend-enfuse - renamed build dependency libopenexr-devel -> openexr-devel
- devil - removed openexr build dependency, not found by cmake. (it wasn't found before either)
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32
### Testing the changes
- I tested the changes in this PR: **WIP**
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 49740 bytes --]
From a9a642c20f29a940db283c9f6b7baabc51b8a548 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/27] New package: Imath-3.1.5, replaces ilmbase.
---
common/shlibs | 6 +---
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 ++++++++++++++++
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
8 files changed, 33 insertions(+), 79 deletions(-)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..065df78575f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,11 +1677,7 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
+libImath-3_1.so.29 Imath-3.1.5_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..6797c40ce781
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.5
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a92b6e8149ddb9ea219d65dfe0d62a3d4d2cdeda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 02/27] openexr: update to 3.1.5.
---
common/shlibs | 7 +++-
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ----------
.../openexr/patches/pkgconfig-prefix.patch | 15 -------
srcpkgs/openexr/template | 39 +++++--------------
4 files changed, 15 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 065df78575f2..fbe9ea4eaf02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,11 @@ 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
libImath-3_1.so.29 Imath-3.1.5_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_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/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3451671e65bc 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,18 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
libopenexr_package() {
@@ -41,6 +21,7 @@ libopenexr_package() {
vmove "usr/lib/*.so.*"
}
}
+
libopenexr-devel_package() {
short_desc+=" - development files"
depends="${makedepends} libopenexr>=${version}_${revision}"
@@ -49,6 +30,6 @@ libopenexr-devel_package() {
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 2835bf637e255cf5e47fa52a99230ce14e0a9188 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 03/27] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index fbe9ea4eaf02..69a0e4e357aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..cb510c177b2f 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel libopenexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 909fc642344ea30556f161dd4eab6dfe8281007f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 04/27] openvdb: rebuild against libopenexr-3.1.5.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..ae89bf155379 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel libopenexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c900933cb859f62f5965e75b0adc078a0c36b1f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 05/27] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From d021e0aa5fe0954896c9b7a3567fdc00fb893823 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 06/27] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 50 ++++++++++++++++--------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 69a0e4e357aa..4a5d6755ce0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ab2605e0d04a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From c258c06175f44a30296af6c64f3e44b8aff4406f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 07/27] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4a5d6755ce0b..2b3997e6e253 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 53df3f5c32c6143e67af9c9aebe6436a09b4862c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 08/27] blender: update to 3.1.0.
---
srcpkgs/blender/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..16946b906383 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.2
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=f36c42d3e9ac42e3290842ca96e825bcb3a26f90822ba159c417ca070e6c2b15
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From dbc3dd92ad22b30c60b2d0560e8001d13e45cb1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/27] gimp: rebuild against libopenexr-3.1.5.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..e47878f46581 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From c84f035884da7b9e0a577d58cf54e1159b7c5f26 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/27] gmic: rebuild against libopenexr-3.1.5.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..9cfc4e9722f7 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From a58b53676096c0493d78427b40aae82f71321a47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/27] darktable: rebuild against libopenexr-3.1.5.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..551c4a3b76c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From 94f34b5b0681d574316a954b54768d5ed77a4fe2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/27] hugin: rebuild against libopenexr-3.1.5.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 59dc65457f1de4ec7c264d88855d5ebabc147d92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/27] kimageformats: rebuild against libopenexr-3.1.5.
---
srcpkgs/kimageformats/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..33ac757ce3ee 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.92.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
From 694cb88bed66febf4956a26c89dd129feb60e87a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 14/27] kio-extras: rebuild against libopenexr-3.1.5.
---
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 ea210a9a562a..4bc68e9a9a57 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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 560e4db156473af43ba23fe847abf1475e628cac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/27] krita: rebuild against libopenexr-3.1.5.
---
srcpkgs/krita/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..731f02424a34 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 92132c8bfa8918a7ce8ebd3c0be38d5ce80e4237 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/27] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 568cd5d52f8fcb60538aa9c98f99e4cecacf435a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/27] opencv4: rebuild against libopenexr-3.1.5.
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From d7bbaa76f0a91ac672213852647bd51c9ccaaebb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/27] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..5838a0b9866c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From a0e22eeec45845cebf93cd689090b15537bbefb4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/27] synfig: rebuild against libopenexr-3.1.5.
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From 14fe0a2dba7fd3a41f5b9b2b2a180d12dbf684c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 20/27] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 46fbd5b50c38d635f7917570c2b4903db27da56a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/27] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 7e4dc07df1765745cb8c53376e801755a762f30c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/27] vips: rebuild against libopenexr-3.1.5.
---
srcpkgs/vips/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
From 68226ccd68f981e0e09853856051535b9965bdf8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 23/27] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 70d91352d107d3fa5c6f96dc7f163be2983a0c61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/27] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From d48dba8a78d75ad95de474f28b503fbaf901a15c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 25/27] calligra: rebuild against libopenexr-3.1.5
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From e07f57c55c24142f4feffda905d0fabc189c7df5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:39 +0100
Subject: [PATCH 26/27] devil: rebuild against libopenexr-3.1.5
---
srcpkgs/devil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 1dffc7bdd52c..e114529d1e64 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -1,7 +1,7 @@
# Template file for 'devil'
pkgname=devil
version=1.8.0
-revision=3
+revision=4
wrksrc="DevIL"
build_wrksrc="DevIL"
build_style=cmake
@@ -10,7 +10,7 @@ makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
short_desc="Developer's Image Library"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
homepage="http://openil.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709
From 20432ed02c36478ccf6640a8bad1bfdcc8487500 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 27/27] enblend-enfuse: rebuild against libopenexr-3.1.5
---
srcpkgs/enblend-enfuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 783bc4a693f4..2dc6a8fcc7ce 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,7 +1,7 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc"
hostmakedepends="pkg-config perl automake"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (19 preceding siblings ...)
2022-04-15 14:58 ` tibequadorian
@ 2022-04-15 15:15 ` tibequadorian
2022-04-15 15:33 ` tibequadorian
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-04-15 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.5.
### Changed templates:
#### Updated:
- ilmbase -> Imath: 2.4.1 -> 3.1.4
- openexr: 2.4.1 -> 3.1.4
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.0
#### Removed:
- Field3D: deprecated and [no longer supported](https://github.com/OpenImageIO/oiio/commit/71177ff402aca408cb1bcbf5c112be2c137dca26)
#### Rebuild (based on `xrevshlib`):
- openvdb
- gimp
- gmic - patched
- darktable
- hugin
- kimageformats
- kio-extras
- krita
- opencv - remove openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disable openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disable openexr support for now: https://github.com/ukoethe/vigra/issues/496
- embree - remove openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - remove openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
#### Otherwise changed:
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32
### Testing the changes
- I tested the changes in this PR: **WIP**
[ci skip]
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 48010 bytes --]
From a9a642c20f29a940db283c9f6b7baabc51b8a548 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/25] New package: Imath-3.1.5, replaces ilmbase.
---
common/shlibs | 6 +---
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 ++++++++++++++++
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
8 files changed, 33 insertions(+), 79 deletions(-)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..065df78575f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,11 +1677,7 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
+libImath-3_1.so.29 Imath-3.1.5_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..6797c40ce781
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.5
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a92b6e8149ddb9ea219d65dfe0d62a3d4d2cdeda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 02/25] openexr: update to 3.1.5.
---
common/shlibs | 7 +++-
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ----------
.../openexr/patches/pkgconfig-prefix.patch | 15 -------
srcpkgs/openexr/template | 39 +++++--------------
4 files changed, 15 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 065df78575f2..fbe9ea4eaf02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,11 @@ 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
libImath-3_1.so.29 Imath-3.1.5_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_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/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3451671e65bc 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,18 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
libopenexr_package() {
@@ -41,6 +21,7 @@ libopenexr_package() {
vmove "usr/lib/*.so.*"
}
}
+
libopenexr-devel_package() {
short_desc+=" - development files"
depends="${makedepends} libopenexr>=${version}_${revision}"
@@ -49,6 +30,6 @@ libopenexr-devel_package() {
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 2835bf637e255cf5e47fa52a99230ce14e0a9188 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 03/25] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index fbe9ea4eaf02..69a0e4e357aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..cb510c177b2f 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel libopenexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 909fc642344ea30556f161dd4eab6dfe8281007f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 04/25] openvdb: rebuild against libopenexr-3.1.5.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..ae89bf155379 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel libopenexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c900933cb859f62f5965e75b0adc078a0c36b1f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 05/25] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From d021e0aa5fe0954896c9b7a3567fdc00fb893823 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 06/25] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 50 ++++++++++++++++--------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 69a0e4e357aa..4a5d6755ce0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ab2605e0d04a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From c258c06175f44a30296af6c64f3e44b8aff4406f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 07/25] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4a5d6755ce0b..2b3997e6e253 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 53df3f5c32c6143e67af9c9aebe6436a09b4862c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 08/25] blender: update to 3.1.0.
---
srcpkgs/blender/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..16946b906383 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.2
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=f36c42d3e9ac42e3290842ca96e825bcb3a26f90822ba159c417ca070e6c2b15
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From dbc3dd92ad22b30c60b2d0560e8001d13e45cb1a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/25] gimp: rebuild against libopenexr-3.1.5.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..e47878f46581 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From c84f035884da7b9e0a577d58cf54e1159b7c5f26 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/25] gmic: rebuild against libopenexr-3.1.5.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..9cfc4e9722f7 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From a58b53676096c0493d78427b40aae82f71321a47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/25] darktable: rebuild against libopenexr-3.1.5.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..551c4a3b76c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From 94f34b5b0681d574316a954b54768d5ed77a4fe2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/25] hugin: rebuild against libopenexr-3.1.5.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 59dc65457f1de4ec7c264d88855d5ebabc147d92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/25] kimageformats: rebuild against libopenexr-3.1.5.
---
srcpkgs/kimageformats/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..33ac757ce3ee 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.92.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
From 694cb88bed66febf4956a26c89dd129feb60e87a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 14/25] kio-extras: rebuild against libopenexr-3.1.5.
---
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 ea210a9a562a..4bc68e9a9a57 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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 560e4db156473af43ba23fe847abf1475e628cac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/25] krita: rebuild against libopenexr-3.1.5.
---
srcpkgs/krita/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..731f02424a34 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 92132c8bfa8918a7ce8ebd3c0be38d5ce80e4237 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/25] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 568cd5d52f8fcb60538aa9c98f99e4cecacf435a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/25] opencv4: rebuild against libopenexr-3.1.5.
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From d7bbaa76f0a91ac672213852647bd51c9ccaaebb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/25] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..5838a0b9866c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From a0e22eeec45845cebf93cd689090b15537bbefb4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/25] synfig: rebuild against libopenexr-3.1.5.
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From 14fe0a2dba7fd3a41f5b9b2b2a180d12dbf684c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 20/25] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 46fbd5b50c38d635f7917570c2b4903db27da56a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/25] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From 7e4dc07df1765745cb8c53376e801755a762f30c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/25] vips: rebuild against libopenexr-3.1.5.
---
srcpkgs/vips/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
From 68226ccd68f981e0e09853856051535b9965bdf8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 23/25] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 70d91352d107d3fa5c6f96dc7f163be2983a0c61 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/25] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 4af79c45d8bbcfaf2e0c1d0382c8be056a505d6b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 25/25] calligra: rebuild against libopenexr-3.1.5.
Patch for support building with OpenEXR 3.
https://invent.kde.org/office/calligra/-/merge_requests/32
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (20 preceding siblings ...)
2022-04-15 15:15 ` [PR PATCH] [Updated] openexr/Imath: update to 3.1.5 tibequadorian
@ 2022-04-15 15:33 ` tibequadorian
2022-04-15 16:58 ` tibequadorian
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-04-15 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.5.
### Changed templates:
#### Updated:
- ilmbase -> Imath: 2.4.1 -> 3.1.5
- openexr: 2.4.1 -> 3.1.5
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.2
#### Removed:
- Field3D: deprecated and [no longer supported](https://github.com/OpenImageIO/oiio/commit/71177ff402aca408cb1bcbf5c112be2c137dca26)
#### Rebuild (based on `xrevshlib`):
- darktable
- gimp
- gmic - patched
- hugin
- kimageformats
- kio-extras
- krita
- opencv - removed openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disabled openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disabled openexr support for now: https://github.com/ukoethe/vigra/issues/496
- vips
#### Otherwise changed:
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32 for OpenEXR 3 support
- embree - removed openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - removed openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
### Testing the changes
- I tested the changes in this PR: **WIP**
[ci skip]
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 48010 bytes --]
From a9a642c20f29a940db283c9f6b7baabc51b8a548 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/25] New package: Imath-3.1.5, replaces ilmbase.
---
common/shlibs | 6 +---
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 ++++++++++++++++
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
8 files changed, 33 insertions(+), 79 deletions(-)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..065df78575f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,11 +1677,7 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
+libImath-3_1.so.29 Imath-3.1.5_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..6797c40ce781
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.5
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a92b6e8149ddb9ea219d65dfe0d62a3d4d2cdeda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 02/25] openexr: update to 3.1.5.
---
common/shlibs | 7 +++-
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ----------
.../openexr/patches/pkgconfig-prefix.patch | 15 -------
srcpkgs/openexr/template | 39 +++++--------------
4 files changed, 15 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 065df78575f2..fbe9ea4eaf02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,11 @@ 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
libImath-3_1.so.29 Imath-3.1.5_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_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/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3451671e65bc 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,18 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
libopenexr_package() {
@@ -41,6 +21,7 @@ libopenexr_package() {
vmove "usr/lib/*.so.*"
}
}
+
libopenexr-devel_package() {
short_desc+=" - development files"
depends="${makedepends} libopenexr>=${version}_${revision}"
@@ -49,6 +30,6 @@ libopenexr-devel_package() {
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 2835bf637e255cf5e47fa52a99230ce14e0a9188 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 03/25] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index fbe9ea4eaf02..69a0e4e357aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..cb510c177b2f 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel libopenexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 909fc642344ea30556f161dd4eab6dfe8281007f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 04/25] openvdb: rebuild against libopenexr-3.1.5.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..ae89bf155379 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel libopenexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c900933cb859f62f5965e75b0adc078a0c36b1f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 05/25] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From d021e0aa5fe0954896c9b7a3567fdc00fb893823 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 06/25] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 50 ++++++++++++++++--------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 69a0e4e357aa..4a5d6755ce0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ab2605e0d04a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From c258c06175f44a30296af6c64f3e44b8aff4406f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 07/25] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4a5d6755ce0b..2b3997e6e253 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From da26f01df75040542e08ffede25f43ad4ddc6170 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 08/25] blender: update to 3.1.2.
---
srcpkgs/blender/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..16946b906383 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.2
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=f36c42d3e9ac42e3290842ca96e825bcb3a26f90822ba159c417ca070e6c2b15
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From 913b00edcd3f98eb317ec94ea5305d4213ff2120 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/25] gimp: rebuild against libopenexr-3.1.5.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..e47878f46581 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From 824333f0507040b1270854d9946d3fe03856a81c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/25] gmic: rebuild against libopenexr-3.1.5.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..9cfc4e9722f7 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From b982a89d370e022d80c2ed297e0dff6500be3d95 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/25] darktable: rebuild against libopenexr-3.1.5.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..551c4a3b76c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From ee39ec27d63270e8c5fed319f68a654c8d515774 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/25] hugin: rebuild against libopenexr-3.1.5.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From c826fdf8ec4df926b00a398368b42f834882c451 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/25] kimageformats: rebuild against libopenexr-3.1.5.
---
srcpkgs/kimageformats/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..33ac757ce3ee 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.92.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
From f64fd8a7cac5ff70f08ce8f554aa211dca2d3189 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 14/25] kio-extras: rebuild against libopenexr-3.1.5.
---
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 ea210a9a562a..4bc68e9a9a57 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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 823dafcf09e50bdaed4870eea5f4f3b6172e8f46 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/25] krita: rebuild against libopenexr-3.1.5.
---
srcpkgs/krita/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..731f02424a34 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 9d4711add6c480bb11c688a815fd565b09754ffb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/25] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 8ed1bd4670b896eca1d105bb8c14ae74cc4eb4c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/25] opencv4: rebuild against libopenexr-3.1.5.
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From b4f6b52684bde2c19936a43c4b1297b451d90537 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/25] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..5838a0b9866c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From d78a45cc3091b569ddfd01d125d0af29a224abf0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/25] synfig: rebuild against libopenexr-3.1.5.
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From aba1a8393c5a9c4aa10180d08e9b524232eac320 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 20/25] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 47a0ed59777db89a713cf08b31c0d3fb61ddf729 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/25] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From a81eb274500f610515a780376f2d14b2ea783f39 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/25] vips: rebuild against libopenexr-3.1.5.
---
srcpkgs/vips/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
From 3309837e5d4f74da988ce1c1f02d5613df5c22f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 23/25] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 18c63df23df23e60df61ffddc85bc53b6e3e307a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/25] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From 9aa0fc934e76abd7941f691ba3e04a7590258dd5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 25/25] calligra: rebuild against libopenexr-3.1.5.
Patch for support building with OpenEXR 3.
https://invent.kde.org/office/calligra/-/merge_requests/32
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (21 preceding siblings ...)
2022-04-15 15:33 ` tibequadorian
@ 2022-04-15 16:58 ` tibequadorian
2022-04-17 18:16 ` tibequadorian
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-04-15 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.5.
### Changed templates:
#### Updated:
- ilmbase -> Imath: 2.4.1 -> 3.1.5
- openexr: 2.4.1 -> 3.1.5
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.2
#### Removed:
- Field3D: deprecated and [no longer supported](https://github.com/OpenImageIO/oiio/commit/71177ff402aca408cb1bcbf5c112be2c137dca26)
#### Rebuild (based on `xrevshlib`):
- darktable
- gimp
- gmic - patched
- hugin
- kimageformats
- kio-extras
- krita
- opencv - removed openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disabled openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disabled openexr support for now: https://github.com/ukoethe/vigra/issues/496
- vips
#### Otherwise changed:
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32 for OpenEXR 3 support
- embree - removed openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - removed openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
### Testing the changes
- I tested the changes in this PR: **WIP**
[ci skip]
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 51667 bytes --]
From a9a642c20f29a940db283c9f6b7baabc51b8a548 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/25] New package: Imath-3.1.5, replaces ilmbase.
---
common/shlibs | 6 +---
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 ++++++++++++++++
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
8 files changed, 33 insertions(+), 79 deletions(-)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..065df78575f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,11 +1677,7 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
+libImath-3_1.so.29 Imath-3.1.5_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..6797c40ce781
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.5
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From a92b6e8149ddb9ea219d65dfe0d62a3d4d2cdeda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 02/25] openexr: update to 3.1.5.
---
common/shlibs | 7 +++-
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ----------
.../openexr/patches/pkgconfig-prefix.patch | 15 -------
srcpkgs/openexr/template | 39 +++++--------------
4 files changed, 15 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index 065df78575f2..fbe9ea4eaf02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,11 @@ 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
libImath-3_1.so.29 Imath-3.1.5_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_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/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3451671e65bc 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,18 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
libopenexr_package() {
@@ -41,6 +21,7 @@ libopenexr_package() {
vmove "usr/lib/*.so.*"
}
}
+
libopenexr-devel_package() {
short_desc+=" - development files"
depends="${makedepends} libopenexr>=${version}_${revision}"
@@ -49,6 +30,6 @@ libopenexr-devel_package() {
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From 2835bf637e255cf5e47fa52a99230ce14e0a9188 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 03/25] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index fbe9ea4eaf02..69a0e4e357aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,7 +2226,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..cb510c177b2f 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel libopenexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From 909fc642344ea30556f161dd4eab6dfe8281007f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 04/25] openvdb: rebuild against libopenexr-3.1.5.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..ae89bf155379 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel libopenexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c900933cb859f62f5965e75b0adc078a0c36b1f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 05/25] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From d021e0aa5fe0954896c9b7a3567fdc00fb893823 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 06/25] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 50 ++++++++++++++++--------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 69a0e4e357aa..4a5d6755ce0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2224,8 +2224,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ab2605e0d04a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From c258c06175f44a30296af6c64f3e44b8aff4406f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 07/25] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4a5d6755ce0b..2b3997e6e253 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From da26f01df75040542e08ffede25f43ad4ddc6170 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 08/25] blender: update to 3.1.2.
---
srcpkgs/blender/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..16946b906383 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.2
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=f36c42d3e9ac42e3290842ca96e825bcb3a26f90822ba159c417ca070e6c2b15
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From 913b00edcd3f98eb317ec94ea5305d4213ff2120 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/25] gimp: rebuild against libopenexr-3.1.5.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..e47878f46581 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From 824333f0507040b1270854d9946d3fe03856a81c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/25] gmic: rebuild against libopenexr-3.1.5.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..9cfc4e9722f7 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From b982a89d370e022d80c2ed297e0dff6500be3d95 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/25] darktable: rebuild against libopenexr-3.1.5.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..551c4a3b76c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From ee39ec27d63270e8c5fed319f68a654c8d515774 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/25] hugin: rebuild against libopenexr-3.1.5.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From c826fdf8ec4df926b00a398368b42f834882c451 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/25] kimageformats: rebuild against libopenexr-3.1.5.
---
srcpkgs/kimageformats/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..33ac757ce3ee 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.92.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
From f64fd8a7cac5ff70f08ce8f554aa211dca2d3189 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 14/25] kio-extras: rebuild against libopenexr-3.1.5.
---
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 ea210a9a562a..4bc68e9a9a57 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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 823dafcf09e50bdaed4870eea5f4f3b6172e8f46 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/25] krita: rebuild against libopenexr-3.1.5.
---
srcpkgs/krita/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..731f02424a34 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 9d4711add6c480bb11c688a815fd565b09754ffb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/25] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From 8ed1bd4670b896eca1d105bb8c14ae74cc4eb4c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/25] opencv4: rebuild against libopenexr-3.1.5.
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From b4f6b52684bde2c19936a43c4b1297b451d90537 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/25] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..5838a0b9866c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From d78a45cc3091b569ddfd01d125d0af29a224abf0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/25] synfig: rebuild against libopenexr-3.1.5.
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From aba1a8393c5a9c4aa10180d08e9b524232eac320 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 20/25] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From 47a0ed59777db89a713cf08b31c0d3fb61ddf729 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/25] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From a81eb274500f610515a780376f2d14b2ea783f39 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/25] vips: rebuild against libopenexr-3.1.5.
---
srcpkgs/vips/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
From 3309837e5d4f74da988ce1c1f02d5613df5c22f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 23/25] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 18c63df23df23e60df61ffddc85bc53b6e3e307a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/25] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From f6fe586c56469556b614a6c41f8dae24c15848d5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 25/25] calligra: rebuild against libopenexr-3.1.5.
Patch for support building with OpenEXR 3.
https://invent.kde.org/office/calligra/-/merge_requests/32
---
srcpkgs/calligra/patches/openexr3.patch | 93 +++++++++++++++++++++++++
srcpkgs/calligra/template | 2 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/openexr3.patch
diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+--
+GitLab
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (22 preceding siblings ...)
2022-04-15 16:58 ` tibequadorian
@ 2022-04-17 18:16 ` tibequadorian
2022-07-17 2:14 ` github-actions
2022-08-01 2:14 ` [PR PATCH] [Closed]: " github-actions
25 siblings, 0 replies; 27+ messages in thread
From: tibequadorian @ 2022-04-17 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages openimageio
https://github.com/void-linux/void-packages/pull/36361
openexr/Imath: update to 3.1.5.
### Changed templates:
#### Updated:
- ilmbase -> Imath: 2.4.1 -> 3.1.5
- openexr: 2.4.1 -> 3.1.5
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.2
#### Removed:
- Field3D: deprecated and [no longer supported](https://github.com/OpenImageIO/oiio/commit/71177ff402aca408cb1bcbf5c112be2c137dca26)
#### Rebuild (based on `xrevshlib`):
- darktable
- gimp
- gmic - patched
- hugin
- kimageformats
- kio-extras
- krita
- opencv - removed openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disabled openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disabled openexr support for now: https://github.com/ukoethe/vigra/issues/496
- vips
#### Otherwise changed:
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32 for OpenEXR 3 support
- embree - removed openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - removed openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
### Testing the changes
- I tested the changes in this PR: **WIP**
[ci skip]
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/36361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openimageio-36361.patch --]
[-- Type: text/x-diff, Size: 51667 bytes --]
From 23a14a4a139123bb18196b3e68303568263e3915 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:22:33 +0100
Subject: [PATCH 01/25] New package: Imath-3.1.5, replaces ilmbase.
---
common/shlibs | 6 +---
srcpkgs/Imath-devel | 1 +
srcpkgs/Imath/template | 31 ++++++++++++++++
srcpkgs/ilmbase-devel | 1 -
srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 -----------
.../ilmbase/patches/pkgconfig-prefix.patch | 15 --------
srcpkgs/ilmbase/template | 36 -------------------
srcpkgs/ilmbase/update | 1 -
8 files changed, 33 insertions(+), 79 deletions(-)
create mode 120000 srcpkgs/Imath-devel
create mode 100644 srcpkgs/Imath/template
delete mode 120000 srcpkgs/ilmbase-devel
delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
delete mode 100644 srcpkgs/ilmbase/template
delete mode 100644 srcpkgs/ilmbase/update
diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..a7a4428b7380 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,11 +1678,7 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1
libtcmalloc_debug.so.4 gperftools-2.1.90_1
libprofiler.so.0 gperftools-2.1.90_1
libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1
-libHalf-2_4.so.24 ilmbase-2.4.0_1
-libIex-2_4.so.24 ilmbase-2.4.0_1
-libIexMath-2_4.so.24 ilmbase-2.4.0_1
-libImath-2_4.so.24 ilmbase-2.4.0_1
-libIlmThread-2_4.so.24 ilmbase-2.4.0_1
+libImath-3_1.so.29 Imath-3.1.5_1
libIlmImf-2_4.so.24 libopenexr-2.4.0_1
libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1
diff --git a/srcpkgs/Imath-devel b/srcpkgs/Imath-devel
new file mode 120000
index 000000000000..5f0c79e78775
--- /dev/null
+++ b/srcpkgs/Imath-devel
@@ -0,0 +1 @@
+Imath
\ No newline at end of file
diff --git a/srcpkgs/Imath/template b/srcpkgs/Imath/template
new file mode 100644
index 000000000000..6797c40ce781
--- /dev/null
+++ b/srcpkgs/Imath/template
@@ -0,0 +1,31 @@
+# Template file for 'Imath'
+pkgname=Imath
+version=3.1.5
+revision=1
+build_style=cmake
+short_desc="Library of vector, matrix, and math operations for computer graphics"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/AcademySoftwareFoundation/Imath"
+distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v${version}.tar.gz"
+checksum=1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # https://github.com/AcademySoftwareFoundation/Imath/issues/151
+ make_check=no
+fi
+
+post_install() {
+ vlicense LICENSE.md
+}
+
+Imath-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/ilmbase-devel b/srcpkgs/ilmbase-devel
deleted file mode 120000
index 05bbf3fefdfa..000000000000
--- a/srcpkgs/ilmbase-devel
+++ /dev/null
@@ -1 +0,0 @@
-ilmbase
\ No newline at end of file
diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
deleted file mode 100644
index 340fdd7ce519..000000000000
--- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100
-@@ -4,9 +4,9 @@
- ##
-
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: IlmBase
- Description: Base math and exception libraries
diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template
deleted file mode 100644
index 83e060d4d2af..000000000000
--- a/srcpkgs/ilmbase/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'ilmbase'
-pkgname=ilmbase
-reverts="2.5.2_1"
-version=2.4.2
-revision=2
-wrksrc="openexr-${version}"
-build_wrksrc=IlmBase
-build_style=cmake
-build_helper="qemu"
-short_desc="Base libraries from ILM for OpenEXR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i Half/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
-post_install() {
- vlicense ../LICENSE.md
-}
-
-ilmbase-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/ilmbase/update b/srcpkgs/ilmbase/update
deleted file mode 100644
index 2a2be6dc4c0d..000000000000
--- a/srcpkgs/ilmbase/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.TEST"
From 320c7fe237ca22b6b1334b4dcaf825c39e0c26b7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:48:47 +0100
Subject: [PATCH 02/25] openexr: update to 3.1.5.
---
common/shlibs | 7 +++-
srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ----------
.../openexr/patches/pkgconfig-prefix.patch | 15 -------
srcpkgs/openexr/template | 39 +++++--------------
4 files changed, 15 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch
delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch
diff --git a/common/shlibs b/common/shlibs
index a7a4428b7380..e043ca3a67f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1679,8 +1679,11 @@ 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
libImath-3_1.so.29 Imath-3.1.5_1
-libIlmImf-2_4.so.24 libopenexr-2.4.0_1
-libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1
+libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
+libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
+libIlmThread-3_1.so.30 libopenexr-3.1.5_1
+libIex-3_1.so.30 libopenexr-3.1.5_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/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch
deleted file mode 100644
index 0584598bb38f..000000000000
--- a/srcpkgs/openexr/patches/musl-_fpstate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
-+++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
-@@ -281,10 +281,18 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch
deleted file mode 100644
index d28d9a6e33d9..000000000000
--- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
-+++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
-@@ -6,8 +6,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+exec_prefix=${prefix}/@exec_prefix@
-+libdir=${prefix}/@libdir@
-+includedir=${prefix}/@includedir@
-+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index 3f1b59753c1b..3451671e65bc 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,38 +1,18 @@
# Template file for 'openexr'
pkgname=openexr
-version=2.4.1
-revision=2
+version=3.1.5
+revision=1
build_style=cmake
-build_helper="qemu"
-hostmakedepends="pkg-config"
-makedepends="ilmbase-devel zlib-devel"
-short_desc="High dynamic-range (HDR) image file format"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="zlib-devel Imath-devel"
+short_desc="Reference implementation of the EXR file format"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
license="BSD-3-Clause"
-homepage="https://www.openexr.com/"
-distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- vsed -i IlmBase/Half/CMakeLists.txt \
- IlmBase/ImathTest/CMakeLists.txt \
- OpenEXR/IlmImf/CMakeLists.txt \
- -e "s; COMMAND ; COMMAND qemu-${XBPS_TARGET_QEMU_MACHINE}-static ;g"
- fi
-}
+homepage="https://github.com/AcademySoftwareFoundation/openexr"
+distfiles="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${version}.tar.gz"
+checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec
post_install() {
- local d f
-
vlicense LICENSE.md
-
- # Remove files which are already in ilmbase{,-devel}
- for pkg in ilmbase ilmbase-devel; do
- for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
- rm -f "${DESTDIR}/$f"
- done
- done
}
libopenexr_package() {
@@ -41,6 +21,7 @@ libopenexr_package() {
vmove "usr/lib/*.so.*"
}
}
+
libopenexr-devel_package() {
short_desc+=" - development files"
depends="${makedepends} libopenexr>=${version}_${revision}"
@@ -49,6 +30,6 @@ libopenexr-devel_package() {
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share
+ vmove usr/share/doc
}
}
From b380e51faa5a7215acf659677b6309275b8d6e95 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:23:59 +0100
Subject: [PATCH 03/25] opencolorio: update to 2.1.1.
---
common/shlibs | 2 +-
.../opencolorio/patches/disable_werror.patch | 30 ------
.../patches/fix-cmake-files-location.patch | 99 -------------------
srcpkgs/opencolorio/patches/musl.patch | 43 ++++++++
srcpkgs/opencolorio/template | 18 ++--
5 files changed, 52 insertions(+), 140 deletions(-)
delete mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch
delete mode 100644 srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
create mode 100644 srcpkgs/opencolorio/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index e043ca3a67f5..085c0a3198e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2227,7 +2227,7 @@ libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
-libOpenColorIO.so.1 opencolorio-1.0.8_1
+libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.49.2_7
diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch
deleted file mode 100644
index 4d1111452d2c..000000000000
--- a/srcpkgs/opencolorio/patches/disable_werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
-diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
-index a90ca1c..b1f0361 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -20,12 +20,6 @@ if(WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
- endif()
-
--# Process all warnings as errors
--# Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
--
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
- message(FATAL "Python libraries were not found, exiting.")
diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
deleted file mode 100644
index 6a2e118f0acd..000000000000
--- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8d48ee8da42de2d878db7b42586db8b3c67f83e1 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 19 Jan 2018 10:17:18 +0000
-Subject: [PATCH] Use GNUInstallDirs and fix install location for cmake files
- (#501)
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-Fix the location where the .cmake files are installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a399d57a..473f1b79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -558,7 +559,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -623,7 +624,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -635,7 +636,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -673,4 +674,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 5970db64..4d97f72c 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -173,6 +173,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
-
diff --git a/srcpkgs/opencolorio/patches/musl.patch b/srcpkgs/opencolorio/patches/musl.patch
new file mode 100644
index 000000000000..28af207b75b9
--- /dev/null
+++ b/srcpkgs/opencolorio/patches/musl.patch
@@ -0,0 +1,43 @@
+From 57b786ca00a617b8f530eeecc951da9156b18c03 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Sat, 26 Mar 2022 17:03:31 +0100
+Subject: [PATCH] Fix musl build
+
+In the 'from_chars' function, it's first checked if errno is 0 and immediately
+returns with an std::errc::result_out_of_range aka [ERANGE].
+According to strtod(3p), if no conversion could be performed, errno may be set
+to [EINVAL]. musl libc does this so we exclude EINVAL from the first check.
+
+musl does not contain the 'strtol_l' function so we use 'strtol' instead.
+---
+ src/utils/NumberUtils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
+index d0a7471f..f600b876 100644
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif __GLIBC__
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
+--
+2.35.1
+
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..cb510c177b2f 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,28 +1,26 @@
# Template file for 'opencolorio'
pkgname=opencolorio
-version=1.1.1
+version=2.1.1
revision=1
wrksrc="OpenColorIO-${version}"
build_style=cmake
-configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_PYTHON=OFF"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) ;;
+ x86_64*) ;;
*) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
esac
-make_cmd=make
hostmakedepends="pkg-config git"
-makedepends="tinyxml-devel lcms2-devel"
-short_desc="A complete color management solution"
+makedepends="lcms2-devel expat-devel libopenexr-devel Imath-devel yaml-cpp-devel"
+short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="openimageio"
+license="BSD-3-Clause"
homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
-checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
post_install() {
+ rm -rf ${DESTDIR}/builddir
vlicense LICENSE
}
From a23833e2c34c2d6be50e9a233833a381461bffd6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 04/25] openvdb: rebuild against libopenexr-3.1.5.
---
srcpkgs/openvdb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..ae89bf155379 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,11 +1,11 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+makedepends="boost-devel tbb-devel libopenexr-devel c-blosc-devel
glfw-devel libXxf86vm-devel jemalloc-devel"
short_desc="Sparse volume data structure and tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From f3e08a73b6bfcf20ace92ae5519c43805a559999 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:03:09 +0100
Subject: [PATCH 05/25] Field3D: remove package.
Field3D is deprecated in openimageio.
---
srcpkgs/Field3D-devel | 1 -
srcpkgs/Field3D/template | 25 -------------------------
2 files changed, 26 deletions(-)
delete mode 120000 srcpkgs/Field3D-devel
delete mode 100644 srcpkgs/Field3D/template
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
deleted file mode 120000
index 7482d5683e82..000000000000
--- a/srcpkgs/Field3D-devel
+++ /dev/null
@@ -1 +0,0 @@
-Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
deleted file mode 100644
index 62f0589e9e0b..000000000000
--- a/srcpkgs/Field3D/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'Field3D'
-pkgname=Field3D
-version=1.7.3
-revision=2
-build_style=cmake
-makedepends="boost-devel hdf5-devel ilmbase-devel"
-short_desc="Library for storing voxel data on disk and in memory"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
-distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
-checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
-
-post_install() {
- vlicense COPYING
-}
-
-Field3D-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} $makedepends"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- }
-}
From a0a42aef9f194c9185b52ed176626c974aa359bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 14:27:33 +0100
Subject: [PATCH 06/25] openimageio: update to 2.3.13.0.
---
common/shlibs | 4 +--
srcpkgs/openimageio/template | 50 ++++++++++++++++--------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 085c0a3198e4..dab10b83b1d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2225,8 +2225,8 @@ libgom-1.0.so.0 gom-0.3.0_1
libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
-libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO_Util.so.2.3 openimageio-2.3.13.0_1
+libOpenImageIO.so.2.3 openimageio-2.3.13.0_1
libOpenColorIO.so.2.1 opencolorio-2.1.1_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..ab2605e0d04a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,23 +1,29 @@
# Template file for 'openimageio'
pkgname=openimageio
-version=2.2.15.1
-revision=3
-wrksrc="oiio-Release-${version}"
+version=2.3.13.0
+revision=1
+_robinmap_version=0.6.2
+_fmt_version=8.0.0
+create_wrksrc=yes
+build_wrksrc="oiio-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config git"
+ -DSTOP_ON_WARNING=0"
+hostmakedepends="pkg-config"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
- Field3D-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel"
short_desc="Library for reading and writing images"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="BSD-3-Clause"
homepage="https://sites.google.com/site/openimageio/home"
changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
-distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=f222c6b51a40aabbc80ddf4055535be9af1ffa907452fa6d1ffa7674854aab17
+distfiles="https://github.com/OpenImageIO/oiio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Tessil/robin-map/archive/refs/tags/v${_robinmap_version}.tar.gz
+ https://github.com/fmtlib/fmt/archive/refs/tags/${_fmt_version}.tar.gz"
+checksum="78f5754f1a9eb8215d66ca62a2963b87fc2b91465cb181dfc4ef73ca3ed76adb
+ c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8ef1
+ 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
# Runs checks even for features we disabled.
make_check=no
@@ -28,26 +34,15 @@ esac
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=0"
+else
+ configure_args+=" -DCOMPILER_SUPPORTS_ATOMIC_WITHOUT_LIBATOMIC=1"
fi
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0"
-fi
-
-pre_build() {
- local f
- # Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
- vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Add libatomic to the targets
- vsed -i src/libOpenImageIO/CMakeLists.txt \
- -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);"
- for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do
- vsed -i src/${f}/CMakeLists.txt \
- -e "s;^\(target_link_libraries .*\));\1 atomic);"
- done
- fi
+post_extract() {
+ mkdir ${build_wrksrc}/ext
+ mv robin-map-${_robinmap_version} ${build_wrksrc}/ext/robin-map
+ mv fmt-${_fmt_version} ${build_wrksrc}/ext/fmt
}
post_install() {
@@ -61,7 +56,6 @@ openimageio-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/cmake
vmove "usr/lib/*.so"
}
}
From a9fc4bf89e417fd180985bc8716a61d9744a18bb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 23:55:12 +0100
Subject: [PATCH 07/25] alembic: update to 1.8.3.
---
common/shlibs | 2 +-
srcpkgs/alembic/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dab10b83b1d8..66a3cb36d889 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3905,7 +3905,7 @@ libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
libblosc.so.1 c-blosc-1.17.1_1
libopenvdb.so.9.0 openvdb-9.0.0_1
-libAlembic.so.1.7 alembic-1.7.13_1
+libAlembic.so.1.8 alembic-1.8.3_1
libmodsecurity.so.3 modsecurity-3.0.4_1
libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd3..bcf9943ae068 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,16 +1,16 @@
# Template file for 'alembic'
pkgname=alembic
-version=1.7.16
+version=1.8.3
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel ilmbase-devel"
+makedepends="zlib-devel Imath-devel"
short_desc="Open framework for storing and sharing scene data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
-homepage="https://alembic.io"
+homepage="https://www.alembic.io"
distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 1c608e15d0a6ada5d751eef596e03aae58fda9ab Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 08/25] blender: update to 3.1.2.
---
srcpkgs/blender/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..16946b906383 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
-version=3.0.0
-revision=4
+version=3.1.2
+revision=1
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -26,7 +26,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.blender.org"
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
-checksum=50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb
+checksum=f36c42d3e9ac42e3290842ca96e825bcb3a26f90822ba159c417ca070e6c2b15
python_version=3
CXXFLAGS="-DNDEBUG"
CFLAGS="$CXXFLAGS"
From bbde7c2e706ee446cfeee24f9febf2c5408168ed Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 09/25] gimp: rebuild against libopenexr-3.1.5.
---
srcpkgs/gimp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0f031768c7b1..e47878f46581 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.30
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -27,7 +27,7 @@ no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+ vsed -i 's:^py_prefix=:py_prefix='"$XBPS_CROSS_BASE"':' configure
fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From eec701d1ca0abb919e8c52b8253b9b46f2b18f0c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 10/25] gmic: rebuild against libopenexr-3.1.5.
---
srcpkgs/gmic/patches/openexr3.patch | 13 +++++++++++++
srcpkgs/gmic/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gmic/patches/openexr3.patch
diff --git a/srcpkgs/gmic/patches/openexr3.patch b/srcpkgs/gmic/patches/openexr3.patch
new file mode 100644
index 000000000000..beb650dafb6f
--- /dev/null
+++ b/srcpkgs/gmic/patches/openexr3.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -308,8 +308,8 @@ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagic
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
+-OPENEXR_LIBS = -lIlmImf -lHalf
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath
++OPENEXR_LIBS = -lOpenEXR -lImath
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..9cfc4e9722f7 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
-makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
+makedepends="fftw-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
From 133cde075091a4e8c06dffd8a7fe693b0accb200 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 11/25] darktable: rebuild against libopenexr-3.1.5.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ef44020cf2be..551c4a3b76c6 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.8.0
-revision=3
+revision=4
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From 4773fdb609a61673a8e2dfd5146eeac3f5a16ccd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 12/25] hugin: rebuild against libopenexr-3.1.5.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From d567d7de317c2d3b5432e1843d5fd0e41b67289f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:30 +0100
Subject: [PATCH 13/25] kimageformats: rebuild against libopenexr-3.1.5.
---
srcpkgs/kimageformats/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..33ac757ce3ee 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,7 +1,7 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.92.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
From 38fc9e8953055afe4a84fac4f60405c45c12be4f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 14/25] kio-extras: rebuild against libopenexr-3.1.5.
---
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 ea210a9a562a..4bc68e9a9a57 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=21.12.3
-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 b9cdab542ff87b1bc8cd6db36c5def3a199c4070 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 15/25] krita: rebuild against libopenexr-3.1.5.
---
srcpkgs/krita/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..731f02424a34 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
# Template file for 'krita'
pkgname=krita
version=5.0.2
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev -DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
python_version=3
replaces="calligra-krita>=0"
+# Tests are not built
make_check=no
case "$XBPS_TARGET_MACHINE" in
From 96fea8433748cc8c765f752ea5381cebd6a93fbd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 16/25] opencv: remove dependency on openexr.
Use statically linked bundled openexr instead.
---
srcpkgs/opencv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 10c687200014..2fa74682c162 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
# Template file for 'opencv'
pkgname=opencv
version=3.4.15
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -9,7 +9,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
+ jasper-devel ocl-icd-devel libgomp-devel gtk+3-devel
libgphoto2-devel gst-plugins-base1-devel openblas-devel
python-numpy python3-numpy python-devel python3-devel"
short_desc="Computer vision and machine learning software library"
From d3d8eee32b47a5c3bfbd459393b9781ff4de4470 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 17/25] opencv4: rebuild against libopenexr-3.1.5.
---
srcpkgs/opencv4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 595d8b2e22a9..06986920b1c6 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
# Template file for 'opencv4'
pkgname=opencv4
version=4.5.3
-revision=2
+revision=3
wrksrc=opencv-${version}
build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
From e07522ac3ebd3c1edf98b8c439a9737b3966bf43 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 18/25] osg: disable openexr support.
---
srcpkgs/osg/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..5838a0b9866c 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OSGPL-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
@@ -31,7 +31,7 @@ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2 -Wno-deprecated-declarations"
build_options="openexr poppler qt vnc"
-build_options_default="openexr poppler vnc"
+build_options_default="poppler vnc"
desc_option_openexr="Enable support for high dynamic range images"
desc_option_poppler="Enable support for creating PDF"
desc_option_vnc="Enable support for VNC server"
From 16ab4ec176ed18441d184567eb39209a31692159 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:31 +0100
Subject: [PATCH 19/25] synfig: rebuild against libopenexr-3.1.5.
---
srcpkgs/synfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 87416c4a1731..c14771a9955c 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,7 @@
# Template file for 'synfig'
pkgname=synfig
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
From 728b5224f340770d2f194421470acea4ca361842 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 20/25] synfigstudio: rebuild against openexr-3.1.4.
---
srcpkgs/synfigstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 6c7e437732a0..800b20f696e4 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,7 @@
# Template file for 'synfigstudio'
pkgname=synfigstudio
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
From f32f876e2fd56edc8d260aec1243c8619af1c0bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 21/25] vigra: remove openexr support.
---
srcpkgs/vigra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template
index e9f949b520ee..e0a92d867bea 100644
--- a/srcpkgs/vigra/template
+++ b/srcpkgs/vigra/template
@@ -1,13 +1,13 @@
# Template file for 'vigra'
pkgname=vigra
version=1.11.1
-revision=6
+revision=7
wrksrc="${pkgname}-Version-${version//./-}"
build_style=cmake
configure_args="-DWITH_OPENEXR=1"
hostmakedepends="python3"
makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel
- boost-devel libopenexr-devel"
+ boost-devel"
short_desc="Image processing and analysis library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From caf78a49191703f09be7e90242b2b22c5ce7ac5a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 21:51:32 +0100
Subject: [PATCH 22/25] vips: rebuild against libopenexr-3.1.5.
---
srcpkgs/vips/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 956519e4c8f2..f8d810e7b9c6 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,7 +1,7 @@
# Template file for 'vips'
pkgname=vips
version=8.12.1
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
# TODO: As of version 8.11 vips supports loading its support for OpenSlide,
From ea7df8a141cba882714036218cb3dac4a4a29fdd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 23/25] embree: remove openexr build dependency.
It's not needed anymore, embree removed OpenEXR support.
https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
---
srcpkgs/embree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 697120e337e8..1360cfe261f2 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,13 +1,13 @@
# Template file for 'embree'
pkgname=embree
version=3.13.2
-revision=2
+revision=3
archs="x86_64*"
build_style=cmake
configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
hostmakedepends="ispc"
makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
+ libjpeg-turbo-devel libmagick-devel glfw-devel"
short_desc="High Performance Ray Tracing Kernels"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
From 8ff9bddb6bb2efd5f9b6a03c769075d397930ef6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:59 +0100
Subject: [PATCH 24/25] libgdal: remove build dependency on openexr.
OpenEXR support was first added in 3.1.0, but we have 3.0.4.
https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 870ab22b4cba..94cb5fded8a1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
+ libcurl-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
proj-devel sqlite-devel ocl-icd-devel"
short_desc="Geospatial Data Abstraction Library"
From d1097b4916b890dc367b18a5ffd863da6f62c17b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 26 Mar 2022 22:58:34 +0100
Subject: [PATCH 25/25] calligra: rebuild against libopenexr-3.1.5.
Patch for support building with OpenEXR 3.
https://invent.kde.org/office/calligra/-/merge_requests/32
---
srcpkgs/calligra/patches/openexr3.patch | 93 +++++++++++++++++++++++++
srcpkgs/calligra/template | 2 +-
2 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/openexr3.patch
diff --git a/srcpkgs/calligra/patches/openexr3.patch b/srcpkgs/calligra/patches/openexr3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/srcpkgs/calligra/patches/openexr3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+--
+GitLab
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=6
+revision=7
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (23 preceding siblings ...)
2022-04-17 18:16 ` tibequadorian
@ 2022-07-17 2:14 ` github-actions
2022-08-01 2:14 ` [PR PATCH] [Closed]: " github-actions
25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-07-17 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/36361#issuecomment-1186375516
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Closed]: openexr/Imath: update to 3.1.5.
2022-03-26 13:56 [PR PATCH] openimageio: update to 2.3.13.0 tibequadorian
` (24 preceding siblings ...)
2022-07-17 2:14 ` github-actions
@ 2022-08-01 2:14 ` github-actions
25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-08-01 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]
There's a closed pull request on the void-packages repository
openexr/Imath: update to 3.1.5.
https://github.com/void-linux/void-packages/pull/36361
Description:
### Changed templates:
#### Updated:
- ilmbase -> Imath: 2.4.1 -> 3.1.5
- openexr: 2.4.1 -> 3.1.5
- openimageio: 2.2.15.1 -> 2.3.13.0
- opencolorio: 1.1.1 -> 2.1.1
- alembic: 1.7.16 -> 1.8.3
- blender: 3.0.0 -> to 3.1.2
#### Removed:
- Field3D: deprecated and [no longer supported](https://github.com/OpenImageIO/oiio/commit/71177ff402aca408cb1bcbf5c112be2c137dca26)
#### Rebuild (based on `xrevshlib`):
- darktable
- gimp
- gmic - patched
- hugin
- kimageformats
- kio-extras
- krita
- opencv - removed openexr build dependency and use statically linked bundled library instead
- opencv4
- osg - disabled openexr support for now: https://github.com/openscenegraph/OpenSceneGraph/issues/1075
- synfig
- synfigstudio
- vigra - disabled openexr support for now: https://github.com/ukoethe/vigra/issues/496
- vips
#### Otherwise changed:
- calligra - patched with https://invent.kde.org/office/calligra/-/merge_requests/32 for OpenEXR 3 support
- embree - removed openexr build dependency, not needed anymore: https://github.com/embree/embree/commit/483491e5239450ad43b696e85ae8df0a262b819e
- libgdal - removed openexr build dependency, not needed yet: https://github.com/OSGeo/gdal/commit/fa3753f073407f60d7556c70ce8e5ebd9c46aa36 (we have 3.0.4)
### Testing the changes
- I tested the changes in this PR: **WIP**
[ci skip]
#### Local build testing:
I built all changed templates successfully for the following targets:
- x86_64
- i686
- aarch64 (crossbuild)
- armv7l (crossbuild)
- x86_64-musl
- armv6l-musl (crossbuild)
- aarch64-musl (crossbuild)
^ permalink raw reply [flat|nested] 27+ messages in thread