From 1b9a9bd758c8261a482350744b6c3397300ec06f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mar 20 2024 15:47:33 +0000 Subject: Fix building on F40+ Resolves: rhbz#2260997 Signed-off-by: Nils Philippsen --- diff --git a/0001-py-add-const-qualifiers-to-ufuncs-prototypes-for-lat.patch b/0001-py-add-const-qualifiers-to-ufuncs-prototypes-for-lat.patch new file mode 100644 index 0000000..9658d8b --- /dev/null +++ b/0001-py-add-const-qualifiers-to-ufuncs-prototypes-for-lat.patch @@ -0,0 +1,39 @@ +From 95ff046c698156f21e2ca0d1d8a02c23ab76969f Mon Sep 17 00:00:00 2001 +From: Paul Brossier +Date: Thu, 2 Jul 2020 11:16:13 +0200 +Subject: [PATCH] [py] add const qualifiers to ufuncs prototypes for latest + numpy + +--- + python/ext/ufuncs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/python/ext/ufuncs.c b/python/ext/ufuncs.c +index d373d725..e5641342 100644 +--- a/python/ext/ufuncs.c ++++ b/python/ext/ufuncs.c +@@ -3,8 +3,8 @@ + + typedef smpl_t (*aubio_unary_func_t)(smpl_t input); + +-static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions, +- npy_intp* steps, void* data) ++static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions, ++ const npy_intp* steps, void* data) + { + npy_intp i; + npy_intp n = dimensions[0]; +@@ -22,8 +22,8 @@ static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions, + } + } + +-static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions, +- npy_intp* steps, void* data) ++static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions, ++ const npy_intp* steps, void* data) + { + npy_intp i; + npy_intp n = dimensions[0]; +-- +2.44.0 + diff --git a/aubio.spec b/aubio.spec index a1947f2..d610e49 100644 --- a/aubio.spec +++ b/aubio.spec @@ -8,7 +8,7 @@ Name: aubio Version: 0.4.9 -Release: 20%{?dist} +Release: 21%{?dist} Summary: An audio labeling tool License: GPLv3+ @@ -18,6 +18,7 @@ Patch0: %{name}-unversioned-python.patch Patch1: %{name}-python39.patch Patch2: %{name}-invalid-escape-sequence.patch Patch3: %{name}-imp-removed.patch +Patch4: 0001-py-add-const-qualifiers-to-ufuncs-prototypes-for-lat.patch BuildRequires: doxygen BuildRequires: fftw-devel @@ -131,6 +132,9 @@ sed -i -e '/^#![[:blank:]]*\//, 1d' %{buildroot}%{python3_sitearch}/%{name}/*.py %{python3_sitearch}/%{name}*.egg-info %changelog +* Wed Mar 20 2024 Nils Philippsen - 0.4.9-21 +- Fix building on F40+ (rhbz#2260997) + * Mon Jan 22 2024 Fedora Release Engineering - 0.4.9-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild