From 23a14a4a139123bb18196b3e68303568263e3915 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " +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 " -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 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 " +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 - -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 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 -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..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 " -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 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 " From f3e08a73b6bfcf20ace92ae5519c43805a559999 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 " -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 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 " 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 " 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 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 " 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 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 " 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 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 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 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 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 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 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 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 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 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 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 " -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 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 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 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 " license="MIT" From caf78a49191703f09be7e90242b2b22c5ce7ac5a Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 " license="Apache-2.0" From 8ff9bddb6bb2efd5f9b6a03c769075d397930ef6 Mon Sep 17 00:00:00 2001 From: tibequadorian 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 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 +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"