Revert rebuilding HDF5 dependent packages

mingw-w64-adios2/PKGBUILD

@@ -4,15 +4,15 @@ _realname=ADIOS2
 pkgbase=mingw-w64-${_realname,,}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}")
 pkgver=2.9.2
-pkgrel=2
+pkgrel=1
 pkgdesc="The Adaptable Input/Output System version 2 (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://adios2.readthedocs.io/en/latest/"
-msys2_repository_url="https://github.com/ornladios/ADIOS2/"
 msys2_references=(
   'archlinux: adios2'
 )
+msys2_repository_url="https://github.com/ornladios/ADIOS2/"
+url="https://adios2.readthedocs.io/en/latest/"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-blosc2"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
@@ -62,13 +62,14 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  LDFLAGS+=" -Wl,--export-all-symbols" \
-  CXXFLAGS+=" -Wno-narrowing" \
+  LDFLAGS+=" -Wl,--export-all-symbols"
+  CXXFLAGS+=" -Wno-narrowing"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${extra_config[@]}" \
+    ${extra_config[@]} \
     -DCMAKE_C_FLAGS=-Duint="\"unsigned int\"" \
     -DBUILD_SHARED_LIBS=ON \
     -DADIOS2_USE_EXTERNAL_DEPENDENCIES=ON \

mingw-w64-alembic/PKGBUILD

@@ -4,21 +4,21 @@ _realname=alembic
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.8.5
-pkgrel=2
+pkgrel=1
 pkgdesc="A open framework for storing and sharing scene data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.alembic.io/"
-msys2_repository_url="https://github.com/alembic/alembic"
 license=('spdx:BSD-3-Clause')
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-imath"
-         "${MINGW_PACKAGE_PREFIX}-hdf5")
+depends=("${MINGW_PACKAGE_PREFIX}-imath"
+         "${MINGW_PACKAGE_PREFIX}-boost"
+         "${MINGW_PACKAGE_PREFIX}-hdf5"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-boost")
-source=("https://github.com/alembic/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alembic/${_realname}/archive/${pkgver}.tar.gz"
         "0001-alembic-1.7.9-fix-windows-build.patch"
         "0002-alembic-1.7.9-remove-msc_ver-and-fix-builtins-and-includes.patch")
 sha256sums=('180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9'

mingw-w64-armadillo/PKGBUILD

@@ -4,16 +4,17 @@ _realname=armadillo
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=12.6.4
-pkgrel=2
+pkgrel=1
 pkgdesc="Fast C++ matrix library with syntax similar to MATLAB and Octave (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://arma.sourceforge.io/"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-hdf5"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-superlu"
-         "${MINGW_PACKAGE_PREFIX}-arpack"
+         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-i686* ]] || echo "${MINGW_PACKAGE_PREFIX}-arpack")
          )
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -46,18 +47,11 @@ prepare() {
 build() {
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
-  declare -a _extra_config
-  if check_option "debug" "n"; then
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-  else
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   "${MINGW_PREFIX}"/bin/cmake.exe \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-    "${_extra_config[@]}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DOPENBLAS_PROVIDES_LAPACK=ON \
     ../${_realname}-${pkgver}
 

mingw-w64-cgns/PKGBUILD

@@ -4,12 +4,11 @@ _realname=cgns
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.4.0
-pkgrel=2
+pkgrel=1
 pkgdesc="CFD General Notation System library and tools (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://cgns.github.io"
-msys2_repository_url="https://github.com/CGNS/CGNS"
 license=('spdx:Zlib')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"

mingw-w64-highfive/PKGBUILD

@@ -4,7 +4,7 @@ _realname=highfive
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.9.0
-pkgrel=2
+pkgrel=1
 pkgdesc='Modern header-only C++11 friendly interface for libhdf5 (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -29,21 +29,17 @@ source=("https://github.com/BlueBrain/HighFive/archive/v${pkgver}/${_realname}-$
 sha256sums=('6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e')
 
 build() {
-  declare -a _extra_config
-  if check_option "debug" "n"; then
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-  else
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-  fi
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # HIGHFIVE_* options only affect tests (at package-build time),
   # not what is installed
   # (xtensor is not packaged, thus OFF)
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${_extra_config[@]}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DHIGHFIVE_USE_BOOST=ON \
     -DHIGHFIVE_USE_EIGEN=ON \
     -DHIGHFIVE_USE_XTENSOR=OFF \
@@ -52,10 +48,9 @@ build() {
     -DHIGHFIVE_PARALLEL_HDF5=OFF \
     -DHIGHFIVE_BUILD_DOCS=OFF \
     -DCMAKE_RUNTIME_OUTPUT_DIRECTORY="${srcdir}/build-${MSYSTEM}" \
-    -S HighFive-${pkgver} \
-    -B build-${MSYSTEM}
+    -S ../HighFive-${pkgver} -B .
 
-  ${MINGW_PREFIX}/bin/cmake --build build-${MSYSTEM}
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 check() {

mingw-w64-itk/PKGBUILD

@@ -4,7 +4,7 @@ _realname=itk
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.3.0
-pkgrel=9
+pkgrel=8
 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')

mingw-w64-libexodus/PKGBUILD

@@ -6,32 +6,30 @@ _releases=2023-02-03
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=8.19
-pkgrel=2
+pkgrel=1
 pkgdesc="EXODUS is a model developed to store and retrieve data for finite element analyses (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
-url="https://sandialabs.github.io/seacas-docs"
-msys2_repository_url="https://github.com/sandialabs/seacas"
-license=('spdx:BSD-3-Clause-Clear')
 conflicts=("${MINGW_PACKAGE_PREFIX}-seacas"
            "${MINGW_PACKAGE_PREFIX}-trilinos")
 depends=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
-         "${MINGW_PACKAGE_PREFIX}-hdf5"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
          "${MINGW_PACKAGE_PREFIX}-netcdf")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("https://github.com/sandialabs/seacas/archive/v${_releases}/${_realname}-${pkgver}.tar.gz"
+url="https://sandialabs.github.io/seacas-docs"
+license=('BSD')
+source=("https://github.com/sandialabs/seacas/archive/v${_releases}.tar.gz"
         "cmake-fix.patch")
 sha256sums=('8076d8efc064ef261bb64bd1d064088586d9197b94cbfb0bba199a78243ca9e8'
             '3f9f345dd0474e1e5831fc0ae69fe6fe3ab86eb2a90c52f96fd5c2babe05519f')
-noextract=("${_realname}-${pkgver}.tar.gz")
+noextract=("v${_releases}.tar.gz")
 
 prepare() {
-  echo "Extracting ${_realname}-${pkgver}.tar.gz ..."
-  tar -xzf ${_realname}-${pkgver}.tar.gz || true
+  echo "Extracting v${_releases}.tar.gz ..."
+  tar -xzf v${_releases}.tar.gz || true
 
   cd "${srcdir}"/${_realname2}-${_releases}
   sed -i 's:-pedantic::g' cmake-exodus

mingw-w64-mathgl/PKGBUILD

@@ -4,7 +4,7 @@ _realname=mathgl
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.0.1
-pkgrel=5
+pkgrel=4
 pkgdesc="Library for high-quality scientific graphics (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -50,8 +50,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${extra_config[@]}" \
-    -DCMAKE_CXX_STANDARD=14 \
+    ${extra_config[@]} \
     -Denable-all-widgets=OFF \
     -Denable-double=ON \
     -Denable-fltk=ON \
@@ -65,6 +64,7 @@ build() {
     -Denable-png=ON \
     -Denable-qt5=ON \
     -Denable-openmp=OFF \
+    -DGLUT_glut_LIBRARY_RELEASE=${MINGW_PREFIX}/lib/libfreeglut.dll.a \
     "../${_realname}-${pkgver}"
 
     # -Denable-pdf=ON

mingw-w64-matio/PKGBUILD

@@ -4,22 +4,21 @@ _realname=matio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.27
-pkgrel=2
+pkgrel=1
 pkgdesc="C library for reading and writing MATLAB MAT files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://sourceforge.net/projects/matio/'
-msys2_repository_url='https://github.com/tbeu/matio/'
 msys2_references=(
   'archlinux: libmatio'
   "cpe: cpe:/a:matio_project:matio"
 )
+msys2_repository_url='https://github.com/tbeu/matio/'
+url='https://sourceforge.net/projects/matio/'
 license=('spdx:BSD-2-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-hdf5")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
 source=(https://github.com/tbeu/matio/releases/download/v${pkgver}/matio-${pkgver}.tar.gz)
 sha256sums=('0a6aa00b18c4512b63a8d27906b079c8c6ed41d4b2844f7a4ae598e18d22d3b3')
 
@@ -36,6 +35,9 @@ build() {
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST} \
     --enable-shared \
     --with-hdf5
 

mingw-w64-med/PKGBUILD

@@ -8,7 +8,7 @@ _realname=med
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=4.1.1
-pkgrel=10
+pkgrel=9
 pkgdesc="Generic pre- and post-processing platform for numerical simulation (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -18,13 +18,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-hdf5"
          $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
          "${MINGW_PACKAGE_PREFIX}-tk")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-fc"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* && ${MSYSTEM} != *64 ]] || echo \
+               "${MINGW_PACKAGE_PREFIX}-fc")
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("https://github.com/chennes/med/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("http://files.salome-platform.org/Salome/other/${_realname}-${pkgver}.tar.gz"
         "hdf5-1.14.patch"
         "bin-dest.patch")
-sha256sums=('ee8b3b6d46bfee25c1d289308b16c7f248d1339161fd5448339382125e6119ad'
+sha256sums=('dc2b5d54ebf0666e3ff2e974041d2ab0da906061323537023ab165d573389dd0'
             'd2d711adc32083041c85906e84592873b1ab6c54b02670b57678a33edce10fa9'
             '75f078af79b58d41ccc6f4a2ccf1a0ab4aa50365600d279ef2466456a3bfa67f')
 
@@ -39,7 +40,7 @@ apply_patch_with_msg() {
 # =========================================== #
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}_SRC"
   apply_patch_with_msg \
     hdf5-1.14.patch \
     bin-dest.patch
@@ -69,7 +70,7 @@ build() {
     -DMEDFILE_BUILD_PYTHON=OFF \
     -DMEDFILE_BUILD_TESTS=OFF \
     -DMEDFILE_INSTALL_DOC=OFF \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${pkgver}_SRC
   "${MINGW_PREFIX}"/bin/cmake --build .
 
   # Shared Build
@@ -84,7 +85,7 @@ build() {
     -DMEDFILE_BUILD_PYTHON=OFF \
     -DMEDFILE_BUILD_TESTS=OFF \
     -DMEDFILE_INSTALL_DOC=OFF \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${pkgver}_SRC
   "${MINGW_PREFIX}"/bin/cmake --build .
 }
 
@@ -97,6 +98,6 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}-shared"
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LESSER" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}_SRC/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}_SRC/COPYING.LESSER" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"
 }

mingw-w64-netcdf-cxx/PKGBUILD

@@ -3,15 +3,14 @@ _realname=netcdf-cxx
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.3.1
-pkgrel=6
+pkgrel=5
 pkgdesc="NetCDF C++ bindings (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/Unidata/netcdf-cxx4/"
 license=(custom)
 depends=(
-  "${MINGW_PACKAGE_PREFIX}-hdf5"
-  "${MINGW_PACKAGE_PREFIX}-netcdf"
+  "${MINGW_PACKAGE_PREFIX}-netcdf>=4.6.0"
   'sed'     # for ncxx4-config
   )
 makedepends=(
@@ -32,7 +31,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p "build-${MSYSTEM}" && cd "build-${MSYSTEM}"
+  mkdir -p "build-${MSYSTEM}" && cd "build--${MSYSTEM}"
 
   ../${_realname}${pkgver/.*/}-${pkgver}/configure -C \
     --prefix="${MINGW_PREFIX}"

mingw-w64-netcdf/PKGBUILD

@@ -4,13 +4,12 @@ _realname=netcdf
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.9.2
-pkgrel=5
+pkgrel=4
 pkgdesc="Interface for scientific data access to large binary data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://www.unidata.ucar.edu/software/netcdf/"
-msys2_repository_url="https://github.com/Unidata/netcdf-c"
 license=('spdx:BSD-3-Clause')
+url="https://www.unidata.ucar.edu/software/netcdf/"
 depends=("${MINGW_PACKAGE_PREFIX}-blosc"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-curl"

mingw-w64-octave/PKGBUILD

@@ -4,7 +4,7 @@ _realname=octave
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=9.1.0
-pkgrel=6
+pkgrel=4
 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')