libexodus: update to 9.04
This commit is contained in:
parent
380f3d4530
commit
1adc3974e9
@ -2,39 +2,36 @@
|
||||
|
||||
_realname=libexodus
|
||||
_realname2=seacas
|
||||
_releases=2023-02-03
|
||||
_releases=2025-05-22
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=8.19
|
||||
pkgrel=2
|
||||
pkgver=9.04
|
||||
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')
|
||||
conflicts=("${MINGW_PACKAGE_PREFIX}-seacas"
|
||||
"${MINGW_PACKAGE_PREFIX}-trilinos")
|
||||
depends=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
|
||||
"${MINGW_PACKAGE_PREFIX}-libwinpthread"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread"
|
||||
"${MINGW_PACKAGE_PREFIX}-netcdf")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-fc"
|
||||
"${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja")
|
||||
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=("v${_releases}.tar.gz")
|
||||
source=("https://github.com/sandialabs/seacas/archive/v${_releases}/${_realname2}-${_releases}.tar.gz")
|
||||
sha256sums=('50e941ad2bfffa84d84465576cd118a14698b3f0cfcfc613dbb1aa3f2f4ebdda')
|
||||
noextract=("${_realname2}-${_releases}.tar.gz")
|
||||
|
||||
prepare() {
|
||||
echo "Extracting v${_releases}.tar.gz ..."
|
||||
tar -xzf v${_releases}.tar.gz || true
|
||||
echo "Extracting ${_realname2}-${_releases}.tar.gz ..."
|
||||
tar -xzf ${_realname2}-${_releases}.tar.gz || true
|
||||
|
||||
cd "${srcdir}"/${_realname2}-${_releases}
|
||||
sed -i 's:-pedantic::g' cmake-exodus
|
||||
|
||||
patch -Np1 -i "${srcdir}/cmake-fix.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -64,7 +61,8 @@ build() {
|
||||
package() {
|
||||
cd "${_realname2}-${_releases}/build-${MSYSTEM}"
|
||||
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
|
||||
install -Dm644 "${srcdir}/seacas-${_releases}/packages/seacas/libraries/exodus"/COPYRIGHT "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
|
||||
install -Dm644 "${srcdir}"/seacas-${_releases}/packages/seacas/libraries/exodus/COPYRIGHT \
|
||||
"${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
|
||||
# Remove extra files
|
||||
rm -rf "${pkgdir}"${MINGW_PREFIX}/lib/external_packages
|
||||
}
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
--- a/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake
|
||||
+++ b/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake
|
||||
@@ -258,7 +258,7 @@
|
||||
endforeach()
|
||||
|
||||
# Now match all the -I flags
|
||||
- if (${_cflags})
|
||||
+ if ("${_cflags}")
|
||||
string(REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _inc_path_flags ${_cflags})
|
||||
|
||||
# Loop through each
|
||||
--- a/cmake/FortranSettings.cmake
|
||||
+++ b/cmake/FortranSettings.cmake
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
IF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
|
||||
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fcray-pointer -fdefault-real-8 -fdefault-integer-8 -fno-range-check")
|
||||
+ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "LLVMFlang")
|
||||
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-integer-8")
|
||||
ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "XL")
|
||||
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qintsize=8 -qrealsize=8")
|
||||
ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
|
||||
--- a/packages/seacas/cmake/FortranSettings.cmake
|
||||
+++ b/packages/seacas/cmake/FortranSettings.cmake
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
IF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
|
||||
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fcray-pointer -fdefault-real-8 -fdefault-integer-8 -fno-range-check")
|
||||
+ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "LLVMFlang")
|
||||
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-integer-8")
|
||||
ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "XL")
|
||||
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qintsize=8 -qrealsize=8")
|
||||
ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
|
||||
@ -1,17 +0,0 @@
|
||||
--- seacas-2021-05-12/packages/seacas/libraries/exodus/src/ex_utils.c
|
||||
+++ seacas-2021-05-12/packages/seacas/libraries/exodus/src/ex_utils.c
|
||||
@@ -1741,8 +1741,12 @@ void ex__compress_variable(int exoid, int varid, int type)
|
||||
for details on SZIP library and parameters.
|
||||
*/
|
||||
|
||||
- /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
|
||||
- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
|
||||
+#if !defined(NC_SZIP_EC)
|
||||
+ const int NC_SZIP_EC = 4; /* Selects entropy coding method for szip. */
|
||||
+#endif
|
||||
+#if !defined(NC_SZIP_NN)
|
||||
+ const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */
|
||||
+#endif
|
||||
/* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
|
||||
const int SZIP_PIXELS_PER_BLOCK =
|
||||
file->compression_level == 0 ? 32 : file->compression_level;
|
||||
Loading…
x
Reference in New Issue
Block a user