diff --git a/science/cgribex/Makefile b/science/cgribex/Makefile index cbc0287d6174..0f9b1690fb3b 100644 --- a/science/cgribex/Makefile +++ b/science/cgribex/Makefile @@ -1,33 +1,32 @@ PORTNAME= cgribex -PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTVERSION= 2.3.1 CATEGORIES= science -MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/26325/ \ +MASTER_SITES= https://code.mpimet.mpg.de/attachments/download/30191/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Lightweight GRIBEX in C with portable Fortran interface WWW= https://code.mpimet.mpg.de/projects/cgribex LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES= libtool CPPFLAGS+= -DgFortran GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= JASPER SZIP OPTIONS_DEFAULT=JASPER SZIP JASPER_CONFIGURE_WITH= jasper=${LOCALBASE} JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper SZIP_CONFIGURE_WITH= szlib=${LOCALBASE} SZIP_LIB_DEPENDS= libsz.so:science/libaec post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgribex.so .include diff --git a/science/cgribex/distinfo b/science/cgribex/distinfo index 113401fbec31..eaa3a60ad5a3 100644 --- a/science/cgribex/distinfo +++ b/science/cgribex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712644650 -SHA256 (cgribex-2.0.0.tar.gz) = 27619de2a9ce9bdbf4eba580e75e45e123f0c921abba1b81d619f2286b132cd2 -SIZE (cgribex-2.0.0.tar.gz) = 625469 +TIMESTAMP = 1773966754 +SHA256 (cgribex-2.3.1.tar.gz) = 771a204a6f5804cd7cda7f2bb1f2c8fac5fa08c6b583a08f342d91ff1b202b52 +SIZE (cgribex-2.3.1.tar.gz) = 626837 diff --git a/science/cgribex/files/patch-src_minmax__val.c b/science/cgribex/files/patch-src_minmax__val.c index be2b27531f86..68115638e879 100644 --- a/science/cgribex/files/patch-src_minmax__val.c +++ b/science/cgribex/files/patch-src_minmax__val.c @@ -1,41 +1,30 @@ ---- src/minmax_val.c.orig 2022-03-21 21:31:13 UTC +--- src/minmax_val.c.orig 2024-10-23 07:38:19 UTC +++ src/minmax_val.c -@@ -303,8 +303,8 @@ void pwr6_minmax_val_double_unrolled6(const double *re - size_t i, j; - size_t residual = datasize % __UNROLL_DEPTH_1; - size_t ofs = datasize - residual; -- double register dmin[__UNROLL_DEPTH_1]; -- double register dmax[__UNROLL_DEPTH_1]; -+ double dmin[__UNROLL_DEPTH_1]; -+ double dmax[__UNROLL_DEPTH_1]; - - for ( j = 0; j < __UNROLL_DEPTH_1; j++) - { -@@ -316,21 +316,21 @@ void pwr6_minmax_val_double_unrolled6(const double *re +@@ -322,21 +322,21 @@ pwr6_minmax_val_double_unrolled6(const double *restric { - for (j = 0; j < __UNROLL_DEPTH_1; j++) - { -- dmin[j] = __fsel(dmin[j] - data[i+j], data[i+j], dmin[j]); -- dmax[j] = __fsel(data[i+j] - dmax[j], data[i+j], dmax[j]); -+ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[i+j], data[i+j], dmin[j]); -+ dmax[j] = __builtin_ppc_fsel(data[i+j] - dmax[j], data[i+j], dmax[j]); - } + for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) + { +- dmin[j] = __fsel(dmin[j] - data[i + j], data[i + j], dmin[j]); +- dmax[j] = __fsel(data[i + j] - dmax[j], data[i + j], dmax[j]); ++ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[i + j], data[i + j], dmin[j]); ++ dmax[j] = __builtin_ppc_fsel(data[i + j] - dmax[j], data[i + j], dmax[j]); + } } - for (j = 0; j < residual; j++) + for (size_t j = 0; j < residual; ++j) { -- dmin[j] = __fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]); -- dmax[j] = __fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]); -+ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[ofs+j], data[ofs+j], dmin[j]); -+ dmax[j] = __builtin_ppc_fsel(data[ofs+j] - dmax[j], data[ofs+j], dmax[j]); +- dmin[j] = __fsel(dmin[j] - data[ofs + j], data[ofs + j], dmin[j]); +- dmax[j] = __fsel(data[ofs + j] - dmax[j], data[ofs + j], dmax[j]); ++ dmin[j] = __builtin_ppc_fsel(dmin[j] - data[ofs + j], data[ofs + j], dmin[j]); ++ dmax[j] = __builtin_ppc_fsel(data[ofs + j] - dmax[j], data[ofs + j], dmax[j]); } - for ( j = 0; j < __UNROLL_DEPTH_1; j++) + for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) { -- *fmin = __fsel(*fmin - dmin[j], dmin[j], *fmin); -- *fmax = __fsel(dmax[j] - *fmax, dmax[j], *fmax); -+ *fmin = __builtin_ppc_fsel(*fmin - dmin[j], dmin[j], *fmin); -+ *fmax = __builtin_ppc_fsel(dmax[j] - *fmax, dmax[j], *fmax); +- *fmin = __fsel(*fmin - dmin[j], dmin[j], *fmin); +- *fmax = __fsel(dmax[j] - *fmax, dmax[j], *fmax); ++ *fmin = __builtin_ppc_fsel(*fmin - dmin[j], dmin[j], *fmin); ++ *fmax = __builtin_ppc_fsel(dmax[j] - *fmax, dmax[j], *fmax); } } #undef __UNROLL_DEPTH_1