diff --git a/tools/MINGW-packages/mingw-w64-imath/0001-cmake-libs-name.patch b/tools/MINGW-packages/mingw-w64-imath/0001-cmake-libs-name.patch index 1b09a8ddd..ab0751f48 100644 --- a/tools/MINGW-packages/mingw-w64-imath/0001-cmake-libs-name.patch +++ b/tools/MINGW-packages/mingw-w64-imath/0001-cmake-libs-name.patch @@ -1,22 +1,58 @@ --- a/config/Imath.pc.in +++ b/config/Imath.pc.in -@@ -13,5 +13,5 @@ +@@ -7,11 +7,11 @@ + exec_prefix=${prefix} + libdir=@PKG_CONFIG_INSTALL_LIBDIR@ + includedir=@PKG_CONFIG_INSTALL_INCLUDEDIR@ +-libsuffix=@LIB_SUFFIX_DASH@ ++ + Name: Imath + Description: Imath library: vector/matrix and math operations, plus the half type. Version: @IMATH_VERSION@ Requires: Conflicts: -Libs: -L${libdir} -lImath${libsuffix} +Libs: -L${libdir} -lImath Cflags: -I${includedir} -I${includedir}/Imath ---- a/config/LibraryDefine.cmake -+++ b/config/LibraryDefine.cmake -@@ -79,7 +79,9 @@ - endif() ++++ b/src/Imath/CMakeLists.txt +--- a/src/Imath/CMakeLists.txt +@@ -146,7 +146,8 @@ + COMMENT "Copying resource files to Imath.framework/Resources in build directory" + ) + else() +- set_target_properties(${IMATH_LIBRARY} PROPERTIES OUTPUT_NAME "Imath${IMATH_LIB_SUFFIX}" ) ++ set_target_properties(${IMATH_LIBRARY} PROPERTIES OUTPUT_NAME "Imath" ++ RUNTIME_OUTPUT_NAME "Imath${IMATH_LIB_SUFFIX}" ) + endif() + + # +--- a/src/python/PyImath/CMakeLists.txt ++++ b/src/python/PyImath/CMakeLists.txt +@@ -123,7 +123,8 @@ + MACOSX_RPATH TRUE) + else() + set_target_properties(${PYIMATH_LIBRARY} PROPERTIES +- OUTPUT_NAME "${PYIMATH_LIBRARY}${PYIMATH_LIB_SUFFIX}" ++ OUTPUT_NAME "${PYIMATH_LIBRARY}_Python${Python3_VERSION_MAJOR}_${Python3_VERSION_MINOR}" ++ RUNTIME_OUTPUT_NAME "${PYIMATH_LIBRARY}${PYIMATH_LIB_SUFFIX}" + SOVERSION ${IMATH_LIB_SOVERSION} + VERSION ${IMATH_LIB_VERSION} + POSITION_INDEPENDENT_CODE ON +--- a/src/python/PyImath/PyImath.pc.in ++++ b/src/python/PyImath/PyImath.pc.in +@@ -7,8 +7,6 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-libsuffix=@lib_suffix@ +-pylibsuffix=@pylib_suffix@ - set_target_properties(${libname} PROPERTIES -- OUTPUT_NAME "${libname}${IMATH_LIB_SUFFIX}" -+ OUTPUT_NAME "${libname}" -+ RUNTIME_OUTPUT_NAME "${libname}${IMATH_LIB_SUFFIX}" -+ ARCHIVE_OUTPUT_NAME "${libname}" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - add_library(${PROJECT_NAME}::${libname} ALIAS ${libname}) + boost_includedir=@Boost_INCLUDE_DIRS@ + boost_libdir=@boost_libdir@ +@@ -21,5 +19,5 @@ + Name: PyImath + Description: Python wrappings of Imath classes/functions + Version: @IMATH_VERSION@ +-Libs: -L${libdir} -lImath${libsuffix} -lPyImath${pylibsuffix} -L${boost_libdir} -l${boost_libname} -L${python_libdir} -l${python_libname} ++Libs: -L${libdir} -lImath -lPyImath_Python@Python3_VERSION_MAJOR@_@Python3_VERSION_MINOR@ -L${boost_libdir} -l${boost_libname} -L${python_libdir} -l${python_libname} + Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ -I${includedir}/@PYIMATH_OUTPUT_SUBDIR@ -I${boost_includedir} -I${python_includedir} diff --git a/tools/MINGW-packages/mingw-w64-imath/0002-fix-openexr-clang-build.patch b/tools/MINGW-packages/mingw-w64-imath/0002-fix-openexr-clang-build.patch index 576220ab3..ab0751f48 100644 --- a/tools/MINGW-packages/mingw-w64-imath/0002-fix-openexr-clang-build.patch +++ b/tools/MINGW-packages/mingw-w64-imath/0002-fix-openexr-clang-build.patch @@ -1,20 +1,58 @@ ---- a/src/Imath/ImathVec.h -+++ b/src/Imath/ImathVec.h -@@ -873,7 +873,7 @@ - //---------------------------------------------------------------------------- +--- a/config/Imath.pc.in ++++ b/config/Imath.pc.in +@@ -7,11 +7,11 @@ + exec_prefix=${prefix} + libdir=@PKG_CONFIG_INSTALL_LIBDIR@ + includedir=@PKG_CONFIG_INSTALL_INCLUDEDIR@ +-libsuffix=@LIB_SUFFIX_DASH@ ++ + Name: Imath + Description: Imath library: vector/matrix and math operations, plus the half type. + Version: @IMATH_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} -lImath${libsuffix} ++Libs: -L${libdir} -lImath + Cflags: -I${includedir} -I${includedir}/Imath ++++ b/src/Imath/CMakeLists.txt +--- a/src/Imath/CMakeLists.txt +@@ -146,7 +146,8 @@ + COMMENT "Copying resource files to Imath.framework/Resources in build directory" + ) + else() +- set_target_properties(${IMATH_LIBRARY} PROPERTIES OUTPUT_NAME "Imath${IMATH_LIB_SUFFIX}" ) ++ set_target_properties(${IMATH_LIBRARY} PROPERTIES OUTPUT_NAME "Imath" ++ RUNTIME_OUTPUT_NAME "Imath${IMATH_LIB_SUFFIX}" ) + endif() + + # +--- a/src/python/PyImath/CMakeLists.txt ++++ b/src/python/PyImath/CMakeLists.txt +@@ -123,7 +123,8 @@ + MACOSX_RPATH TRUE) + else() + set_target_properties(${PYIMATH_LIBRARY} PROPERTIES +- OUTPUT_NAME "${PYIMATH_LIBRARY}${PYIMATH_LIB_SUFFIX}" ++ OUTPUT_NAME "${PYIMATH_LIBRARY}_Python${Python3_VERSION_MAJOR}_${Python3_VERSION_MINOR}" ++ RUNTIME_OUTPUT_NAME "${PYIMATH_LIBRARY}${PYIMATH_LIB_SUFFIX}" + SOVERSION ${IMATH_LIB_SOVERSION} + VERSION ${IMATH_LIB_VERSION} + POSITION_INDEPENDENT_CODE ON +--- a/src/python/PyImath/PyImath.pc.in ++++ b/src/python/PyImath/PyImath.pc.in +@@ -7,8 +7,6 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-libsuffix=@lib_suffix@ +-pylibsuffix=@pylib_suffix@ - /// @cond Doxygen_Suppress -- -+/* - // Vec2 - template <> IMATH_HOSTDEVICE short Vec2::length() const IMATH_NOEXCEPT = delete; - template <> IMATH_HOSTDEVICE const Vec2& Vec2::normalize() IMATH_NOEXCEPT = delete; -@@ -954,7 +954,7 @@ - template <> IMATH_HOSTDEVICE Vec4 Vec4::normalized() const IMATH_NOEXCEPT = delete; - template <> Vec4 Vec4::normalizedExc() const = delete; - template <> IMATH_HOSTDEVICE Vec4 Vec4::normalizedNonNull() const IMATH_NOEXCEPT = delete; -- -+*/ - /// @endcond Doxygen_Suppress - - //------------------------ + boost_includedir=@Boost_INCLUDE_DIRS@ + boost_libdir=@boost_libdir@ +@@ -21,5 +19,5 @@ + Name: PyImath + Description: Python wrappings of Imath classes/functions + Version: @IMATH_VERSION@ +-Libs: -L${libdir} -lImath${libsuffix} -lPyImath${pylibsuffix} -L${boost_libdir} -l${boost_libname} -L${python_libdir} -l${python_libname} ++Libs: -L${libdir} -lImath -lPyImath_Python@Python3_VERSION_MAJOR@_@Python3_VERSION_MINOR@ -L${boost_libdir} -l${boost_libname} -L${python_libdir} -l${python_libname} + Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ -I${includedir}/@PYIMATH_OUTPUT_SUBDIR@ -I${boost_includedir} -I${python_includedir} diff --git a/tools/MINGW-packages/mingw-w64-imath/PKGBUILD b/tools/MINGW-packages/mingw-w64-imath/PKGBUILD index e99bbbc79..96763fc91 100644 --- a/tools/MINGW-packages/mingw-w64-imath/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-imath/PKGBUILD @@ -3,7 +3,7 @@ _realname=imath pkgbase=mingw-w64-natron_${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-natron_${_realname}") -pkgver=3.1.12 +pkgver=3.2.2 pkgrel=99.1 pkgdesc='A C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics (mingw-w64)' url='https://www.openexr.com/' @@ -19,23 +19,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-python-numpy") optdepends=("${MINGW_PACKAGE_PREFIX}-python: python bindings" "${MINGW_PACKAGE_PREFIX}-boost: python bindings") -source=("https://github.com/AcademySoftwareFoundation/Imath/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" +source=("https://github.com/AcademySoftwareFoundation/Imath/releases/download/v${pkgver}/Imath-${pkgver}.tar.gz" 0001-cmake-libs-name.patch 0002-fix-openexr-clang-build.patch) -sha256sums=('8a1bc258f3149b5729c2f4f8ffd337c0e57f09096e4ba9784329f40c4a9035da' - '2dc2de52e2475cc9d725ff443466d3ac247a405018f1d9b0caeb03a9d5116d9b' - '0eea3c7b57d5b59887f963d696c2afdcfb1976a3913f161995e19b13d6a65086') +sha256sums=('0f5a783b424f374e6f27ec8b0c73130e89b08814ac8fa2e84fd7fe0b05862c53' + '5a70997f2d34eba47210ac93f67b2037ca61c5c967a4a1f00a479d1c5eda490f' + '09b9b180f7a59490d164ef3288fa1f5e5f14f99185cb412fb88d35364690ff6d') prepare() { cd "Imath-${pkgver}" patch -p1 -i "${srcdir}/0001-cmake-libs-name.patch" - if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then - patch -p1 -i "${srcdir}/0002-fix-openexr-clang-build.patch" - fi + patch -p1 -i "${srcdir}/0002-fix-openexr-clang-build.patch" } build() { - mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" declare -a _extra_config if check_option "debug" "n"; then @@ -50,28 +47,31 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - ${MINGW_PREFIX}/bin/cmake.exe \ - -G "Ninja" \ + cmake \ + -GNinja \ "${_extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ - -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \ -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \ - -DIMATH_INSTALL_PKG_CONFIG=ON \ - ../Imath-${pkgver} + -S "Imath-${pkgver}" \ + -B "build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/cmake.exe --build . + cmake --build "build-${MSYSTEM}" } package() { - cd "${srcdir}/build-${MSYSTEM}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./ + DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}" # Fix cmake files local PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX}) find "${pkgdir}${MINGW_PREFIX}/lib/cmake" -type f -name '*.cmake' \ -exec sed -i -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" {} \; + # Fix pkgconfig files + if [[ ${CARCH} != i686 ]]; then + sed -i -e "s|${PREFIX_WIN}|\$\{prefix\}|g" "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/PyImath.pc + fi + install -Dm644 "${srcdir}/Imath-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.md" } diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD index 1fff9cd4e..0a2fa3ce7 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD @@ -3,11 +3,11 @@ _realname=openexr pkgbase=mingw-w64-natron_${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-natron_${_realname}") -pkgver=3.3.2 +pkgver=3.4.4 pkgrel=99.1 pkgdesc='A high dynamic-range image file format library (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.openexr.com/" msys2_repository_url='https://github.com/AcademySoftwareFoundation/openexr' msys2_references=( @@ -16,9 +16,11 @@ msys2_references=( "cpe: cpe:/a:openexr:openexr" ) license=('spdx:BSD-3-Clause') -depends=("${MINGW_PACKAGE_PREFIX}-natron_imath" +depends=("${MINGW_PACKAGE_PREFIX}-cc-libs" + "${MINGW_PACKAGE_PREFIX}-natron_imath" "${MINGW_PACKAGE_PREFIX}-libdeflate" - "${MINGW_PACKAGE_PREFIX}-libwinpthread-git") + "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" + "${MINGW_PACKAGE_PREFIX}-openjph") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") @@ -34,7 +36,7 @@ replaces=( source=("https://github.com/openexr/openexr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" 0006-cmake-soversion.patch 0007-export-TypedAttribute-value.patch) -sha256sums=('5013e964de7399bff1dd328cbf65d239a989a7be53255092fa10b85a8715744d' +sha256sums=('91fc5670f13fe7d9d3b7ae0fe695e3cc813200839084eae6497459e7f650d876' '5653da878ebbf5f3087bb529213931b48e151aef082b34e19d189e22be0411e7' '204777b48cde1c4d390789f10c5e429d5295be701f68a7937a90d0ecf271c048') diff --git a/tools/MINGW-packages/windows_pacman_repo_version.txt b/tools/MINGW-packages/windows_pacman_repo_version.txt index 6694db4ed..594cbf644 100644 --- a/tools/MINGW-packages/windows_pacman_repo_version.txt +++ b/tools/MINGW-packages/windows_pacman_repo_version.txt @@ -1 +1 @@ -20250524-1 +20251119-1