aubio, revbump, rename, fix build with python3.10 (#13503)

This commit is contained in:
Schrijvers Luc
2025-12-27 14:46:40 +01:00
committed by GitHub
parent b906991c77
commit dd5167eb4a
2 changed files with 92 additions and 6 deletions

View File

@@ -9,10 +9,11 @@ live audio."
HOMEPAGE="https://aubio.org"
COPYRIGHT="2003-2019 Paul Brossier"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://aubio.org/pub/aubio-$portVersion.tar.bz2"
CHECKSUM_SHA256="d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da"
SOURCE_DIR="aubio-$portVersion"
PATCHES="aubio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -21,7 +22,7 @@ libVersion="5.4.8"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libaubio$secondaryArchSuffix = $portVersion
aubio$secondaryArchSuffix = $portVersion
cmd:aubiomfcc$secondaryArchSuffix
cmd:aubionotes$secondaryArchSuffix
cmd:aubioonset$secondaryArchSuffix
@@ -39,13 +40,16 @@ REQUIRES="
lib:libsamplerate$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
"
REPLACES="
libaubio$secondaryArchSuffix
"
PROVIDES_devel="
libaubio${secondaryArchSuffix}_devel = $portVersion
aubio${secondaryArchSuffix}_devel = $portVersion
devel:libaubio$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libaubio$secondaryArchSuffix == $portVersion base
aubio$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
@@ -61,10 +65,10 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:python
cmd:python3
"
defineDebugInfoPackage libaubio$secondaryArchSuffix \
defineDebugInfoPackage aubio$secondaryArchSuffix \
"$libDir"/libaubio.so.$libVersion \
"$binDir"/aubiomfcc \
"$binDir"/aubionotes \
@@ -85,6 +89,9 @@ INSTALL()
{
./waf install --notests
# remove static library
rm $libDir/libaubio.a
prepareInstalledDevelLibs libaubio
fixPkgconfig

View File

@@ -0,0 +1,79 @@
From e7ecd4dc9d1ffc886c537845ac7d737696fd8638 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 27 Dec 2025 14:20:15 +0100
Subject: applying patch aubio-unversioned-python.patch
Source: https://src.fedoraproject.org/rpms/aubio/blob/rawhide/f/aubio-unversioned-python.patch
diff --git a/tests/create_tests_source.py b/tests/create_tests_source.py
index 1feb144..1843e32 100755
--- a/tests/create_tests_source.py
+++ b/tests/create_tests_source.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
""" Create a simple stereo file containing a sine tone at 441 Hz, using only
python's built-in modules. """
diff --git a/tests/wscript_build b/tests/wscript_build
index c99a051..f0e1385 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -13,7 +13,7 @@ test_sound_abspath = bld.path.get_bld().make_node(test_sound_target)
test_sound_abspath = str(test_sound_abspath).replace('\\', '\\\\')
b = bld(name='create_tests_source',
- rule='python ${SRC} ${TGT}',
+ rule='python3 ${SRC} ${TGT}',
source='create_tests_source.py',
target=test_sound_target)
# use post() to create the task, keep a reference to it
--
2.52.0
From 2e7d2a5cf31558bc631c2c67e184a645d32f4b9a Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 25 Jan 2022 18:30:27 +0100
Subject: define FF_API_LAVF_AVCTX for libavcodec > 59, thx @berolinux (closes
gh-353)
diff --git a/waf b/waf
index 2d548bf..22a69de 100755
--- a/waf
+++ b/waf
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# encoding: latin-1
# Thomas Nagy, 2005-2018
#
--
2.52.0
From 3654074f2ea2e24e2456cbe9013691bb5e6bf70e Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 27 Dec 2025 14:34:30 +0100
Subject: ffmpeg5 patch
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index 5b25d85..99615d0 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -68,6 +68,10 @@
#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
#endif
+#if LIBAVCODEC_VERSION_MAJOR >= 59
+#define FF_API_LAVF_AVCTX 1
+#endif
+
struct _aubio_source_avcodec_t {
uint_t hop_size;
uint_t samplerate;
--
2.52.0