diff --git a/mingw-w64-adios2/PKGBUILD b/mingw-w64-adios2/PKGBUILD index e2b130bc1dfa9..36057954ff3cd 100644 --- a/mingw-w64-adios2/PKGBUILD +++ b/mingw-w64-adios2/PKGBUILD @@ -4,7 +4,7 @@ _realname=ADIOS2 pkgbase=mingw-w64-${_realname,,} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}") pkgver=2.8.3 -pkgrel=4 +pkgrel=5 pkgdesc="The Adaptable Input/Output System version 2 (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'mingw32' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-alembic/PKGBUILD b/mingw-w64-alembic/PKGBUILD index 31a51c83a02bf..3ff8f96c6650b 100644 --- a/mingw-w64-alembic/PKGBUILD +++ b/mingw-w64-alembic/PKGBUILD @@ -4,7 +4,7 @@ _realname=alembic pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A open framework for storing and sharing scene data (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-armadillo/PKGBUILD b/mingw-w64-armadillo/PKGBUILD index 5fd99db8df605..2eb58fa4f9743 100644 --- a/mingw-w64-armadillo/PKGBUILD +++ b/mingw-w64-armadillo/PKGBUILD @@ -4,7 +4,7 @@ _realname=armadillo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=11.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="C++ linear algebra library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-blender/PKGBUILD b/mingw-w64-blender/PKGBUILD index b7e5b0de5af69..de934e60a1a62 100644 --- a/mingw-w64-blender/PKGBUILD +++ b/mingw-w64-blender/PKGBUILD @@ -12,7 +12,7 @@ _realname=blender pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.93.14 -pkgrel=1 +pkgrel=2 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-cgns/PKGBUILD b/mingw-w64-cgns/PKGBUILD index b4903568dc3a9..520dcc81d12f7 100644 --- a/mingw-w64-cgns/PKGBUILD +++ b/mingw-w64-cgns/PKGBUILD @@ -4,7 +4,7 @@ _realname=cgns pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="CFD General Notation System library and tools (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD index 2ad7f1cf8bde2..bdebb5c510212 100644 --- a/mingw-w64-gdal/PKGBUILD +++ b/mingw-w64-gdal/PKGBUILD @@ -8,7 +8,7 @@ _realname=gdal pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-hdf5/PKGBUILD b/mingw-w64-hdf5/PKGBUILD index b88eb4ae1798e..a0b8dc3f5291e 100644 --- a/mingw-w64-hdf5/PKGBUILD +++ b/mingw-w64-hdf5/PKGBUILD @@ -4,10 +4,10 @@ _realname=hdf5 pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_ver=1.12.2 +_ver=1.14.0 patch= pkgver=${_ver}${patch//-/.} -pkgrel=2 +pkgrel=1 pkgdesc="General purpose library and file format for storing scientific data (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -16,6 +16,8 @@ url="https://www.hdfgroup.org/HDF5/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libaec" "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-curl" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") ) makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" @@ -25,13 +27,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" ) options=('staticlibs' 'strip') source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver%.*}/hdf5-${_ver}${patch}/src/hdf5-${_ver}${patch}.tar.bz2" - "hdf5-fix-pkgconfig.patch" "hdf5-proper-library-names-mingw.patch" - "hdf5-fix-find-szip.patch") -sha256sums=('1a88bbe36213a2cea0c8397201a459643e7155c9dc91e062675b3fb07ee38afe' - 'f2047b06abba6ec5568878a75c45c7c85cf08ec8e8437439bd23902c1e665bec' - '7b5595ee9903e14f147f7b4615648cad6a0f5a76f8299461ebe91d739e750476' - '48bdc4ab0d107bdec11aa3d3a2765cd29eaac5e304c3892365ed2ea352731cbe') + "hdf5-fix-find-szip.patch" + "hdf5-fix-strstria-shlwapi.patch::https://github.com/HDFGroup/hdf5/commit/d300febacda44b5f81d7d882c6f45b56c0424c97.patch" + "hdf5-fix-fortran-module-directory-leak.patch") +sha256sums=('e4e79433450edae2865a4c6328188bb45391b29d74f8c538ee699f0b116c2ba0' + '32312f5cdcc192e819d4b5c30fbef8ce97707425f6727b65728d93a33bdbc0f4' + '96175626455a36b970f9f50a06246f7c65a30057d8feed48172b7bd06a8e4bc0' + '3fab248ac5f9c60da09988ba7c6825248f3072c5599cdcc18eb614baebc2c52e' + '02b5d7335a9db628ed03b29c62d8f0e5f5618fa39de8e453aa02b530d28317a8') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -45,13 +49,11 @@ apply_patch_with_msg() { prepare() { cd "${srcdir}/${_realname}-${_ver}${patch}" - # https://github.com/HDFGroup/hdf5/commit/dcccc355261e305a1d877a798d7fd46556b3cbce.patch apply_patch_with_msg \ - hdf5-fix-pkgconfig.patch - - apply_patch_with_msg \ hdf5-proper-library-names-mingw.patch \ - hdf5-fix-find-szip.patch + hdf5-fix-find-szip.patch \ + hdf5-fix-strstria-shlwapi.patch \ + hdf5-fix-fortran-module-directory-leak.patch } build() { @@ -85,6 +87,8 @@ build() { -DHDF5_INSTALL_CMAKE_DIR="lib/cmake" \ -DHDF5_INSTALL_DATA_DIR="share/doc/hdf5" \ -DHDF5_MSVC_NAMING_CONVENTION=OFF \ + -DHDF5_INSTALL_MODULE_DIR="include" \ + -DHDF5_ENABLE_ROS3_VFD=ON \ ../${_realname}-${_ver}${patch} cmake --build . @@ -93,13 +97,6 @@ build() { package() { cd "${srcdir}/build-${MSYSTEM}" - if [[ "${MINGW_PACKAGE_PREFIX}" != *-clang-* ]]; then - mkdir -p ${srcdir}/build-${MSYSTEM}/bin/static/Release/ - mkdir -p ${srcdir}/build-${MSYSTEM}/bin/shared/Release/ - cp ${srcdir}/build-${MSYSTEM}/bin/static/*.mod ${srcdir}/build-${MSYSTEM}/bin/static/Release - cp ${srcdir}/build-${MSYSTEM}/bin/shared/*.mod ${srcdir}/build-${MSYSTEM}/bin/shared/Release - fi - DESTDIR="${pkgdir}" cmake --install . local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) diff --git a/mingw-w64-hdf5/hdf5-fix-find-szip.patch b/mingw-w64-hdf5/hdf5-fix-find-szip.patch index 4536daa080b2a..cede819df2e02 100644 --- a/mingw-w64-hdf5/hdf5-fix-find-szip.patch +++ b/mingw-w64-hdf5/hdf5-fix-find-szip.patch @@ -1,6 +1,6 @@ --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake -@@ -63,9 +63,9 @@ +@@ -59,9 +59,9 @@ find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) if (NOT ZLIB_FOUND) find_package (ZLIB) # Legacy find @@ -13,7 +13,7 @@ endif () endif () if (ZLIB_FOUND) -@@ -124,9 +124,9 @@ +@@ -116,9 +116,9 @@ find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) if (NOT SZIP_FOUND) find_package (SZIP) # Legacy find diff --git a/mingw-w64-hdf5/hdf5-fix-fortran-module-directory-leak.patch b/mingw-w64-hdf5/hdf5-fix-fortran-module-directory-leak.patch new file mode 100644 index 0000000000000..011a4bc09c3ef --- /dev/null +++ b/mingw-w64-hdf5/hdf5-fix-fortran-module-directory-leak.patch @@ -0,0 +1,10 @@ +--- a/CMakeInstallation.cmake 2023-01-20 00:04:12.334144200 -0500 ++++ b/CMakeInstallation.cmake 2023-01-20 00:03:49.497097700 -0500 +@@ -126,6 +126,7 @@ + else () + set (BYTESEX little-endian) + endif () ++set (CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_MODULE_DIR}) + configure_file ( + ${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in + ${HDF5_SRC_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY diff --git a/mingw-w64-hdf5/hdf5-fix-pkgconfig.patch b/mingw-w64-hdf5/hdf5-fix-pkgconfig.patch deleted file mode 100644 index 4c1396a5dc6ac..0000000000000 --- a/mingw-w64-hdf5/hdf5-fix-pkgconfig.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -187,8 +187,8 @@ - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") - - configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in ---- a/fortran/src/CMakeLists.txt -+++ b/fortran/src/CMakeLists.txt -@@ -551,8 +551,8 @@ - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") - - configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in ---- a/hl/c++/src/CMakeLists.txt -+++ b/hl/c++/src/CMakeLists.txt -@@ -105,8 +105,8 @@ - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") - - configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in ---- a/hl/fortran/src/CMakeLists.txt -+++ b/hl/fortran/src/CMakeLists.txt -@@ -338,8 +338,8 @@ - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") - - configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in ---- a/hl/src/CMakeLists.txt -+++ b/hl/src/CMakeLists.txt -@@ -137,8 +137,8 @@ - set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") - - configure_file ( - ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/mingw-w64-hdf5/hdf5-proper-library-names-mingw.patch b/mingw-w64-hdf5/hdf5-proper-library-names-mingw.patch index 301559a453a8b..c255c863982c0 100644 --- a/mingw-w64-hdf5/hdf5-proper-library-names-mingw.patch +++ b/mingw-w64-hdf5/hdf5-proper-library-names-mingw.patch @@ -1,20 +1,16 @@ ---- hdf5-1.12.0/config/cmake_ext_mod/HDFMacros.cmake.orig 2020-04-26 10:08:44.715403300 +0300 -+++ hdf5-1.12.0/config/cmake_ext_mod/HDFMacros.cmake 2020-04-26 10:34:09.889478600 +0300 -@@ -125,6 +130,8 @@ +--- a/config/cmake/HDFMacros.cmake 2023-01-13 04:34:01.443034400 -0500 ++++ b/config/cmake/HDFMacros.cmake 2023-01-13 04:36:14.419475400 -0500 +@@ -126,10 +126,12 @@ OUTPUT_NAME_RELEASE ${LIB_RELEASE_NAME} OUTPUT_NAME_MINSIZEREL ${LIB_RELEASE_NAME} OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME} + RUNTIME_OUTPUT_NAME ${LIB_RELEASE_NAME}-0 + ARCHIVE_OUTPUT_NAME ${LIB_RELEASE_NAME} ) - #get_property (target_name TARGET ${libtarget} PROPERTY OUTPUT_NAME) - #get_property (target_name_debug TARGET ${libtarget} PROPERTY OUTPUT_NAME_DEBUG) -@@ -132,7 +139,7 @@ - #message (STATUS "${target_name} : ${target_name_debug} : ${target_name_rwdi}") if (${libtype} MATCHES "STATIC") - if (WIN32) + if (MSVC) set_target_properties (${libtarget} PROPERTIES COMPILE_PDB_NAME_DEBUG ${LIB_DEBUG_NAME} - COMPILE_PDB_NAME_RELEASE ${LIB_RELEASE_NAME} + COMPILE_PDB_NAME_DEVELOPER ${LIB_DEBUG_NAME} diff --git a/mingw-w64-highfive/PKGBUILD b/mingw-w64-highfive/PKGBUILD index 7457d3ed06bce..43d6c7abb3fcb 100644 --- a/mingw-w64-highfive/PKGBUILD +++ b/mingw-w64-highfive/PKGBUILD @@ -4,7 +4,7 @@ _realname=highfive pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.6.2 -pkgrel=1 +pkgrel=2 pkgdesc='Modern header-only C++11 friendly interface for libhdf5 (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD index 8fe08e703e8f7..00f9795af2eee 100644 --- a/mingw-w64-itk/PKGBUILD +++ b/mingw-w64-itk/PKGBUILD @@ -4,7 +4,7 @@ _realname=itk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=5.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') diff --git a/mingw-w64-mathgl/PKGBUILD b/mingw-w64-mathgl/PKGBUILD index c9d75575ddea6..c3e8807096b13 100644 --- a/mingw-w64-mathgl/PKGBUILD +++ b/mingw-w64-mathgl/PKGBUILD @@ -4,7 +4,7 @@ _realname=mathgl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=8.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for high-quality scientific graphics (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') diff --git a/mingw-w64-matio/PKGBUILD b/mingw-w64-matio/PKGBUILD index bf8121c38b330..dec37f99fe7d1 100644 --- a/mingw-w64-matio/PKGBUILD +++ b/mingw-w64-matio/PKGBUILD @@ -4,7 +4,7 @@ _realname=matio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.5.23 -pkgrel=1 +pkgrel=2 pkgdesc="matio is a C library for reading and writing MATLAB MAT files (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') diff --git a/mingw-w64-med/PKGBUILD b/mingw-w64-med/PKGBUILD index a939e795504e0..d9baec794c540 100644 --- a/mingw-w64-med/PKGBUILD +++ b/mingw-w64-med/PKGBUILD @@ -8,7 +8,7 @@ _realname=med pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=4.1.1 -pkgrel=4 +pkgrel=5 pkgdesc="Generic pre- and post-processing platform for numerical simulation (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') diff --git a/mingw-w64-netcdf/PKGBUILD b/mingw-w64-netcdf/PKGBUILD index 0474d5e34cf6e..cecdfdd7f09ce 100644 --- a/mingw-w64-netcdf/PKGBUILD +++ b/mingw-w64-netcdf/PKGBUILD @@ -4,7 +4,7 @@ _realname=netcdf pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.9.0 -pkgrel=4 +pkgrel=5 pkgdesc="Interface for scientific data access to large binary data (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-octave/PKGBUILD b/mingw-w64-octave/PKGBUILD index dd4dd4f9d3bbb..c3290c8079fe7 100644 --- a/mingw-w64-octave/PKGBUILD +++ b/mingw-w64-octave/PKGBUILD @@ -2,7 +2,7 @@ _realname=octave pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=7.3.0 -pkgrel=7 +pkgrel=8 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)" url="https://www.octave.org" license=('spdx:GPL-3.0-or-later') diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 3acf6ef1b4ba0..3b710fda657de 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=4.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-openturns/PKGBUILD b/mingw-w64-openturns/PKGBUILD index 68a8fce153cec..18ffc6d0e3345 100644 --- a/mingw-w64-openturns/PKGBUILD +++ b/mingw-w64-openturns/PKGBUILD @@ -4,7 +4,7 @@ _realname=openturns pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.20 -pkgrel=2 +pkgrel=3 pkgdesc="Uncertainty treatment library (mingw-w64)" license=('LGPL') arch=(any) diff --git a/mingw-w64-pdal/PKGBUILD b/mingw-w64-pdal/PKGBUILD index 84cff05005ff2..f9df016e0d5b3 100644 --- a/mingw-w64-pdal/PKGBUILD +++ b/mingw-w64-pdal/PKGBUILD @@ -4,7 +4,7 @@ _realname=pdal pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.4.3 -pkgrel=4 +pkgrel=5 pkgdesc="A C++ library for translating and manipulating point cloud data (mingw-w64)" arch=(any) mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-python-h5py/001-mingw-python.patch b/mingw-w64-python-h5py/001-mingw-python.patch deleted file mode 100644 index 300d9c29d37cc..0000000000000 --- a/mingw-w64-python-h5py/001-mingw-python.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/setup_configure.py -+++ b/setup_configure.py -@@ -224,8 +224,12 @@ - default_path = 'libhdf5.dylib' - regexp = re.compile(r'^libhdf5.dylib') - elif sys.platform.startswith('win'): -- default_path = 'hdf5.dll' -- regexp = re.compile(r'^hdf5.dll') -+ if 'GCC' in sys.version: -+ default_path = 'libhdf5-0.dll' -+ regexp = re.compile(r'^libhdf5-[0-9].dll') -+ else: -+ default_path = 'hdf5.dll' -+ regexp = re.compile(r'^hdf5.dll') - if sys.version_info >= (3, 8): - # To overcome "difficulty" loading the library on windows - # https://bugs.python.org/issue42114 diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index 9ea41e3ddd219..34a7381fce0fa 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -22,10 +22,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-pkg-config") source=(https://github.com/h5py/h5py/releases/download/${pkgver}/h5py-${pkgver}.tar.gz - 001-mingw-python.patch + 001-mingw-python.patch::https://github.com/h5py/h5py/commit/115d5bc2e8bef12c72dfb1ecbc40b2e283d0d05a.patch + 002-Merge-pull-request-2194-from-h5py-libhdf5-1.14.patch::https://github.com/h5py/h5py/commit/3dc3d7c089acaa4532f43ad2283e65a440ec55ac.patch lzf_c.c.patch) sha256sums=('22cdc29324f39102c89542845b02241f8c5a7b180bbed8cc0b14ff72a1c0e478' - '6f586b51ea71ccb29a839d3a243b1c13f1f599d8ef6bf9854c822d09f1c1907f' + '8dc14d226a3eef0a37fd51df0827fe7115558c10ff29d4e32579f5b4c5f58380' + '4bb0380f192ed01e10c905ead78ca80f73909227b5ce9048019aff4bc5dbaf1e' '6d0126b881b5dcd637146d151341b72aa68eef760092272279072ec0bc4ceca9') prepare() { @@ -33,6 +35,8 @@ prepare() { # https://github.com/h5py/h5py/pull/2105 patch -p1 -i ${srcdir}/001-mingw-python.patch + # https://github.com/h5py/h5py/pull/2194 + patch -p1 -i ${srcdir}/002-Merge-pull-request-2194-from-h5py-libhdf5-1.14.patch patch -p1 -i ${srcdir}/lzf_c.c.patch cd "${srcdir}" @@ -52,6 +56,7 @@ package() { cd "${srcdir}/python-build-${MSYSTEM}" H5PY_SETUP_REQUIRES=0 \ + H5PY_ROS3=1 \ MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python setup.py install --skip-build \ --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 diff --git a/mingw-w64-trilinos/PKGBUILD b/mingw-w64-trilinos/PKGBUILD index bad88006e30a4..0fae92eb8b94f 100644 --- a/mingw-w64-trilinos/PKGBUILD +++ b/mingw-w64-trilinos/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=13.4.1 _pkgver=${pkgver//./-} -pkgrel=1 +pkgrel=2 pkgdesc='Algorithms for the solution of large-scale scientific problems" (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64') diff --git a/mingw-w64-vigra/PKGBUILD b/mingw-w64-vigra/PKGBUILD index 6f75e56cab2cf..251fcf2e1b375 100644 --- a/mingw-w64-vigra/PKGBUILD +++ b/mingw-w64-vigra/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.11.1 _pkgver=${pkgver//./-} -pkgrel=8 +pkgrel=9 pkgdesc="vigra - Generic Programming for Computer Vision (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64') diff --git a/mingw-w64-vtk/PKGBUILD b/mingw-w64-vtk/PKGBUILD index 129c93eb9a790..a244ff7ab400e 100644 --- a/mingw-w64-vtk/PKGBUILD +++ b/mingw-w64-vtk/PKGBUILD @@ -5,7 +5,7 @@ _realname=vtk pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=9.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')