From 9cb5d77a6732fadf391fd38da00e6921f3e23112 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 1 Apr 2025 01:33:27 +0100 Subject: gentoo auto-resync : 01:04:2025 - 01:33:27 --- sci-libs/nfft/Manifest | 6 ++-- sci-libs/nfft/files/nfft-3.5.3-gcc15.patch | 43 ++++++++++++++++++++++++ sci-libs/nfft/files/nfft-3.5.3-rtc.patch | 21 ++++++++++++ sci-libs/nfft/nfft-3.5.2.ebuild | 45 ------------------------- sci-libs/nfft/nfft-3.5.3.ebuild | 53 ++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 47 deletions(-) create mode 100644 sci-libs/nfft/files/nfft-3.5.3-gcc15.patch create mode 100644 sci-libs/nfft/files/nfft-3.5.3-rtc.patch delete mode 100644 sci-libs/nfft/nfft-3.5.2.ebuild create mode 100644 sci-libs/nfft/nfft-3.5.3.ebuild (limited to 'sci-libs/nfft') diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest index 461d2a65cdc5..c7e1e4776bff 100644 --- a/sci-libs/nfft/Manifest +++ b/sci-libs/nfft/Manifest @@ -1,3 +1,5 @@ -DIST nfft-3.5.2.tar.gz 5377870 BLAKE2B 5a9b79fd2db781f163f3e694e25096f9abfac67ae9e2f0614444e99160ac6ce150356b72130ba44f82c541120f8876723a06e989a5c125e1da1b85976b7ff500 SHA512 e5437b358f22807de2251527025accf326d77322e029cfc3df6ee733ccca4d020cbd3c045773735de0641618c71e5cc9b8f4df53becea3b7a7e27750f21fa64e -EBUILD nfft-3.5.2.ebuild 915 BLAKE2B 19b9331a9c96181bad3edaf92bdca7b1526f7b3f4df0018e25a8096bf9a1f6b3e66bc666394e9a1c848e1c4d87f04de42376da83958c79cd19ffc9c4abd61e6c SHA512 0d9e0aee237dad6bac189e0223c6895c091f8cb02e158689f619c93cd0e3f055f5c99c8ad7c652bc1f135d1a0917f2f8477d688068972911aa4b9bbdd1c04a43 +AUX nfft-3.5.3-gcc15.patch 2087 BLAKE2B 026d473de8dae1c877b4056eb0c78d4498bb073ead5861376d92514ec8171efbf50971b68f9096d28eb77eca4f4329ba7bbb7446c067a269490d7ed00323e6c8 SHA512 860d2534b1bcb3b753f3e24d6fcd3d1aac850c69901921938641e2834efe5698024d525928b0fddfeaedf61107e676a84555217b7f53b37abb5269923ef3680f +AUX nfft-3.5.3-rtc.patch 764 BLAKE2B b6a7b877e66a5d8f04d83fcd6600e68a1de3aaef47e3f1647944c2172ee9819d45e466177148569305ebf619cbda32ddd6baf4d40a4575e87d0eef0f3bbe49e4 SHA512 e83159e74fe537beba098dc87be8c2e6336bf617b0af57bead7ecb3fd08edfc9ed58dc88830c5d01587cad94f07517badaf532aeac4545ea95c25d50a2dc889a +DIST nfft-3.5.3.tar.gz 5643780 BLAKE2B 7aaa4406250154766377f2e8620690d3f78b48f734f78ded7f611eda8c38fc048d3b38402e7c9f8b219629afe79058b5b2b57e0cf59cd869f0713365381e2ca9 SHA512 062e89bd621cb2f6e348507cf9892e38a92dde10d2d8afbc2642fd4531ae4d65dbc53196831063e015fc65bb589ecc4603d929eb1f498611f392a8270bf11b5d +EBUILD nfft-3.5.3.ebuild 1001 BLAKE2B 45c5b56b82d40522851e7884ca540992ac56cd42dadb5a24cdb81ffae788cfee3dd9a8e9e58759535d567ccb79016d0fb801531d50dddf10f9bf1e40c51fb806 SHA512 eae2dfdeab4e6e56a4303e9753676e5201f078459f15c64d078e01c1ff2a4265c224ee9dda852f5d9ea7b9ada612b75505c842d055106f8c5a95456cadca6b70 MISC metadata.xml 328 BLAKE2B 240bbecf26e4844d414232fbe45923c5c711d935bec1bca14310bdc10a052a1776a7bbed30700b6335f3482141aadc29cb241147708a6018c473224e963b7d94 SHA512 9d806457e7cb9d8e1d8b90763341b3920b68004e1fddce937be0b7781b53961c7efbf243136f9282dddfee17d6da30b35e246c89fece0bf65d0e02b1ee3ce305 diff --git a/sci-libs/nfft/files/nfft-3.5.3-gcc15.patch b/sci-libs/nfft/files/nfft-3.5.3-gcc15.patch new file mode 100644 index 000000000000..66040ad4ac08 --- /dev/null +++ b/sci-libs/nfft/files/nfft-3.5.3-gcc15.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/944858 +https://github.com/NFFT/nfft/pull/146 + +--- a/applications/radon/radon.c.in ++++ b/applications/radon/radon.c.in +@@ -111,7 +111,7 @@ static int linogram_grid(int T, int S, NFFT_R *x, NFFT_R *w) + /** computes the NFFT-based discrete Radon transform of f + * on the grid given by gridfcn() with T angles and R offsets + */ +-static int Radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *f, int NN, NFFT_R *Rf) ++static int Radon_trafo(int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w), int T, int S, NFFT_R *f, int NN, NFFT_R *Rf) + { + int j, k; /**< index for nodes and freqencies */ + NFFT(plan) my_nfft_plan; /**< plan for the nfft-2D */ +@@ -205,7 +205,7 @@ static int Radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *f, int NN, NFFT_R + */ + int main(int argc, char **argv) + { +- int (*gridfcn)(); /**< grid generating function */ ++ int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w); /**< grid generating function */ + int T, S; /**< number of directions/offsets */ + FILE *fp; + int N; /**< image size */ +--- a/applications/radon/inverse_radon.c.in ++++ b/applications/radon/inverse_radon.c.in +@@ -111,7 +111,7 @@ static int linogram_grid(int T, int S, NFFT_R *x, NFFT_R *w) + * on the grid given by gridfcn() with T angles and R offsets + * by a NFFT-based CG-type algorithm + */ +-static int inverse_radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *Rf, int NN, NFFT_R *f, ++static int inverse_radon_trafo(int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w), int T, int S, NFFT_R *Rf, int NN, NFFT_R *f, + int max_i) + { + int j, k; /**< index for nodes and freqencies */ +@@ -237,7 +237,7 @@ static int inverse_radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *Rf, int N + */ + int main(int argc, char **argv) + { +- int (*gridfcn)(); /**< grid generating function */ ++ int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w); /**< grid generating function */ + int T, S; /**< number of directions/offsets */ + FILE *fp; + int N; /**< image size */ diff --git a/sci-libs/nfft/files/nfft-3.5.3-rtc.patch b/sci-libs/nfft/files/nfft-3.5.3-rtc.patch new file mode 100644 index 000000000000..c1b44e89bd06 --- /dev/null +++ b/sci-libs/nfft/files/nfft-3.5.3-rtc.patch @@ -0,0 +1,21 @@ +Remove implicit function declarations incompatible with new GCC. + +This is not UNICOS anyway + +--- a/configure.ac ++++ b/configure.ac +@@ -485,14 +485,6 @@ AC_CHECK_DECLS([nanosleep],[],[],[#include ]) + AC_CHECK_DECLS([drand48],[],[],[#include ]) + AC_CHECK_DECLS([srand48],[],[],[#include ]) + +-# Cray UNICOS _rtc() (real-time clock) intrinsic +-AC_MSG_CHECKING([for _rtc intrinsic]) +-rtc_ok=yes +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_INTRINSICS_H +-#include +-#endif]], [[_rtc()]])],[AC_DEFINE(HAVE__RTC,1,[Define if you have the UNICOS _rtc() intrinsic.])],[rtc_ok=no]) +-AC_MSG_RESULT($rtc_ok) +- + AC_MSG_CHECKING([whether a cycle counter is available]) + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$srcdir/include" diff --git a/sci-libs/nfft/nfft-3.5.2.ebuild b/sci-libs/nfft/nfft-3.5.2.ebuild deleted file mode 100644 index 066540701d6c..000000000000 --- a/sci-libs/nfft/nfft-3.5.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="library for nonequispaced discrete Fourier transformations" -HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/nfft/" -SRC_URI="https://github.com/NFFT/nfft/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc openmp" - -RDEPEND="sci-libs/fftw:3.0[threads,openmp?]" -DEPEND="${RDEPEND}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - econf \ - --enable-all \ - --enable-shared \ - --disable-static \ - $(use_enable openmp) -} - -src_install() { - default - - if ! use doc; then - rm -r "${ED}"/usr/share/doc/${P}/html || die - fi - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/nfft/nfft-3.5.3.ebuild b/sci-libs/nfft/nfft-3.5.3.ebuild new file mode 100644 index 000000000000..09111690b637 --- /dev/null +++ b/sci-libs/nfft/nfft-3.5.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="library for nonequispaced discrete Fourier transformations" +HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/nfft/" +SRC_URI="https://github.com/NFFT/nfft/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc openmp" + +RDEPEND="sci-libs/fftw:3.0=[threads,openmp?]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-gcc15.patch" + "${FILESDIR}/${P}-rtc.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-all \ + $(use_enable openmp) +} + +src_install() { + default + + if ! use doc; then + rm -r "${ED}"/usr/share/doc/${P}/html || die + fi + + # no static archives + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3