From 54a1f214995d6b1b75d2cf356b4f02d8cc1f71ca7fb1766255e21bf4f3c0efda Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 19 Jun 2024 14:04:49 +0000 Subject: [PATCH] - Cherry-pick upstream patch to fix build with GCC 14 * 95ff046c.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/aubio?expand=0&rev=51 --- 95ff046c.patch | 39 +++++++++++++++++++++++++++++++++++++++ python-aubio.changes | 6 ++++++ python-aubio.spec | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 95ff046c.patch diff --git a/95ff046c.patch b/95ff046c.patch new file mode 100644 index 0000000..b5ad558 --- /dev/null +++ b/95ff046c.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.35.3 + diff --git a/python-aubio.changes b/python-aubio.changes index 28ac724..5d32a33 100644 --- a/python-aubio.changes +++ b/python-aubio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 19 07:19:39 UTC 2024 - John Paul Adrian Glaubitz + +- Cherry-pick upstream patch to fix build with GCC 14 + * 95ff046c.patch + ------------------------------------------------------------------- Tue Feb 20 18:19:12 UTC 2024 - Daniel Garcia diff --git a/python-aubio.spec b/python-aubio.spec index ff236be..9db1e01 100644 --- a/python-aubio.spec +++ b/python-aubio.spec @@ -28,6 +28,9 @@ Source1: http://aubio.org/pub/aubio-%{version}.tar.bz2.asc # PATCH-FIX-UPSTREAM waflib_python312.patch gh#aubio/aubio#394 # https://gitlab.com/ita1024/waf/-/commit/d2060dfd8af4edb5824153ff24e207b39ecd67a2 Patch1: waflib_python312.patch +# PATCH-FIX-UPSTREAM 95ff046c.patch +# https://github.com/aubio/aubio/commit/95ff046c698156f21e2ca0d1d8a02c23ab76969f +Patch2: 95ff046c.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module pytest}