gentoo auto-resync : 26:06:2024 - 00:12:24

4 files changed, 75 insertions, 11 deletions

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 19d51746da3a..3cbc144a7179 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,8 +1,10 @@
 AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
+AUX aubio-0.4.9-gcc-14.patch 1275 BLAKE2B a7f110a397c6ce9e568f204a0e98d17376fb9c650a8be96d619bca7b6814914ef4261791119d541ed358e514b685c19017845a18ae8339e382d68a2a54688465 SHA512 9d05520c35ab42b73c6865063d35b774370e85b00bc34d3d5b70ed98cb75a77253747b9a5224178a2567417b36ff1540070bdc2cea4058995352b30384d3ebfd
+AUX aubio-0.4.9-numpy-2.patch 538 BLAKE2B f62160a1be2e9b5e671c8e96477d4b60653b6c27ed20c39aea5eca5257c3732cfbf9c25f5601cead9af54dbc6c8745a6c12da7858115e724490579cc2195e6e0 SHA512 090de3586be64dd5d9d3030f9ca883c40a4d055706681e8a0e0f96765ec0c0229fe2cfc0e6adc70057d1d92f10f47d45c5962348b2865958d7917b3e196b97b3
 AUX aubio-0.4.9-remove-universal-newlines.patch 1198 BLAKE2B 9cd5a5b3880075706938df7c008c6dc160e48402b0cfddf41f7d248c4d0e91a7531a1e87b40d51569220d720b679126ab02693588c4bf4a8c9b12af2a8653665 SHA512 0675f850ddbff6857b1fb7cc6a0f6f5188436fdf74e6c4c123d734e02eee82a0914edf26d2a99351dca4ff9b9a4715d86b24a747746d2b1c4bf4ea7d2cdaf2f1
 AUX ffmpeg5.patch 745 BLAKE2B f353faf80b4fdfb26b2d8a135ab0415ac3f6780a2b5894e18b12e137fb109b1b89b4c8500f8dc1e809d763f851ce186f199f32c680a80c816f40ece997639d0f SHA512 8eeeac40bbf4e1faf7a99d2cbfe4a7b3bc85b5b5927c7bf69ef774ad06fcedcb0a84296dce7300f4907b2ca16525e6db854acad371d788c7f5fb7bd4a94efc86
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 DIST waf-2.0.27.tar.bz2 693624 BLAKE2B 34dcb84df2f42d7c92988226ae0208a9407a091f79e47b8abe1d3b33105d58df06072bfb3c22a7bb6dfa8f083224642c55fa2c9fc0110a2d49d3d10ea754c928 SHA512 a62dbb1ee89d88969c31d3f634577d80b8a595460d445cae9b42ca423cfcbbb96347b5b67697165833f3dd496b4bc7e312e166af86cb3b97ed57ffe59f46b98a
 EBUILD aubio-0.4.9-r2.ebuild 3188 BLAKE2B ead6dd22007fe53e2f9a4ce33d1fe0ee1e9ff4b898eb2ff5c9cb4609360c20f187c9feca1530f42dfc04bb6a2f86d9fec1406c9065aa2f92b779cb2c218bf09c SHA512 542e18d674c33b54718cdcf11700c5476356071534db7b0986e32c10a706a2fa35295d7af5a2a5c147a3e22182817c9900aea7c0c830d51cd62526eb8c759200
-EBUILD aubio-0.4.9-r3.ebuild 3531 BLAKE2B df93ac0477da16296c2861b0b7b716801dc3359b5423ce9289f424f7f62ca4122ea2c4c3370f33a0a1eb8a1c28a9f27082ca2a1da54a4619596b25ed820381a8 SHA512 4dfff6c9ce1a46422f3707791de1037c88855a5655482f62c8dbcc5b00a156f331be91c4269336c37197221e67a6f45d107fbbf73a1dd8ec4874b651e6814991
+EBUILD aubio-0.4.9-r4.ebuild 4074 BLAKE2B fe0ae38e74bce718bf7ee59614c6cde2d1fb4b07a4819dab873f57d51f4b5f77aaa2e50cdd572386999e5b2dae48effcd9e22e78dbf69f2ade197244641da61f SHA512 e041a2dff8e2ae2f463a6dec2df3ffb356968cc2e7b229b97bad048a0a12e7c4a839cd3a4bb6085abec90011afd4f43f4b95c4bf27aeaf220e74b24c6149435e
 MISC metadata.xml 424 BLAKE2B 427627520c0e31649dc3bfa4011cb80b48cac5bc2ba6bea55812b033b1a92e2a07477729f83057ae0c213c82ed20899e05978e6968db3d3ff166e153c4b1c1ea SHA512 a9cb14aef216e074f21616493f1a9276c43f05709b14492de8cbd90d4f19878bc9f905545327985639f05ee75234d11689eba519f88c6bafaa8b848bd887178d
diff --git a/media-libs/aubio/aubio-0.4.9-r3.ebuild b/media-libs/aubio/aubio-0.4.9-r4.ebuild
index 4a910ed12d2e..0c8533c51c66 100644
--- a/media-libs/aubio/aubio-0.4.9-r3.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE='threads(+)'
 inherit distutils-r1 waf-utils
 
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+IUSE="blas doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( double-precision libsamplerate )
@@ -32,6 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	blas? ( virtual/cblas )
 	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
@@ -47,10 +48,8 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-text/txt2man
 	virtual/pkgconfig
-	doc? (
-		app-text/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 BDEPEND="${DISTUTILS_DEPS}"
 
@@ -59,13 +58,23 @@ PYTHON_SRC_DIR="${S}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-gcc-14.patch
+	"${FILESDIR}"/${P}-numpy-2.patch
 	"${FILESDIR}"/ffmpeg5.patch
 )
 
 src_prepare() {
 	default
 
-	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+	# In case when aubio is already installed, calling of the
+	# `sphinx` function at the wscript causes a python interpreter
+	# crash on `import aubio` if aubio was built with <numpy-2,
+	# but current version of numpy is >=2.
+	# Additionally, it causes duplication of the documentation.
+	sed \
+		-e '/\(doxygen\|sphinx\)(bld)$/d' \
+		-e "s/package = 'blas'/package = 'cblas'/" \
+		-i wscript || die
 
 	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
 
@@ -77,7 +86,9 @@ src_prepare() {
 	fi
 
 	# update waf to fix Python 3.12 compatibility
+	python_setup
 	sed -r \
+		-e "s:python:${PYTHON}:" \
 		-e "s:(WAFVERSION=).*:\1${WAFVERSION}:" \
 		-e "s:(WAFURL=).*:\1'${DISTDIR}/${WAFTARBALL}':" \
 		-e 's:^fetchwaf$:cp "${WAFURL}" "${WAFTARBALL}":' \
@@ -91,6 +102,7 @@ src_configure() {
 	local mywafconfargs=(
 		--enable-complex
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable blas)
 		$(use_enable doc docs)
 		$(use_enable double-precision double)
 		$(use_enable fftw fftw3)
@@ -122,8 +134,8 @@ src_compile() {
 			pushd "${S}"/doc &>/dev/null || die
 			python_setup
 			LD_LIBRARY_PATH="${S}/build/src:${LD_LIBRARY_PATH}" \
-			PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
-			emake dirhtml
+			PYTHONPATH="${S%%/}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" \
+			emake html
 		fi
 
 		cd "${S}" || die
@@ -160,7 +172,7 @@ src_install() {
 	if use doc; then
 		dodoc doc/*.txt
 		docinto html
-		dodoc -r doc/_build/dirhtml/.
+		dodoc -r doc/_build/html/.
 	fi
 
 	find "${ED}" -name "*.a" -delete || die
diff --git a/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
new file mode 100644
index 000000000000..658ca9e2ffcf
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
@@ -0,0 +1,37 @@
+# https://bugs.gentoo.org/925102
+# https://github.com/aubio/aubio/commit/95ff046c
+
+From: Paul Brossier <piem@piem.org>
+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 d373d7258..e5641342e 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];
diff --git a/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
new file mode 100644
index 000000000000..be51e88fc6a4
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
@@ -0,0 +1,13 @@
+diff --git a/python/tests/test_cvec.py b/python/tests/test_cvec.py
+index 73ee6549..e21418fc 100755
+--- a/python/tests/test_cvec.py
++++ b/python/tests/test_cvec.py
+@@ -43,7 +43,7 @@ class aubio_cvec_test_case(TestCase):
+         spec = cvec(1024)
+         spec.phas[39:-1] = -np.pi
+         assert_equal(spec.phas[0:39], 0)
+-        assert_equal(spec.phas[39:-1], -np.pi)
++        assert_equal(spec.phas[39:-1], np.asanyarray(-np.pi, spec.phas.dtype))
+         assert_equal(spec.norm, 0)
+ 
+     def test_assign_cvec_with_other_cvec(self):