From 57fdf4ae22de80d7e23d14563d20d2138ecd3189 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " +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 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 " -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 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 " +makedepends="zlib-devel Imath-devel" +short_desc="Reference implementation of the EXR file format" +maintainer="tibequadorian " 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 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 -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 ---- - 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 +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 " -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 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 " license="MPL-2.0" From 41208af999a08a37d4cbbecee740ef4f2022758b Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " -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 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 " 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 " 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 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 " 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 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 " 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 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 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 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 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 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 " license="LGPL-2.0-or-later" From 095d385f0220d7ba28a70bd33cfc748d6bb3470b Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " From f96d8a59918dd50ef37b65bf565a674ca2c6596d Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 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 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 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 " @@ -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 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 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 " license="MIT" From 02298f7f66c4187b12a6ddad6e05a600e02cc1a2 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 " license="Apache-2.0" From a3a320649ccc47bf84d93ed8775a4dee7584cfda Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 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 " license="LGPL-2.1" From 2b9ffbcecbe892b6bc9018940be1350ff20f2699 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " license="GPL-2.0-or-later"