git: b0b2c32dbf6f - main - audio/aubio: Fix build with FFmpeg 8

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b0b2c32dbf6f7a1af5e00405ede13570e6e099a6

commit b0b2c32dbf6f7a1af5e00405ede13570e6e099a6
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-10-10 05:47:38 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-10-11 04:45:21 +0000

    audio/aubio: Fix build with FFmpeg 8
    
    Backport upstream commits:
    245deeadd81afc4ec5635b65d71646490c5c19fd
    0b947f9634937d27589d995ec90e90d763aca86f
    53bc55cda4f0e106e63b8a993538fa4debf4bb66
    
    Import compatibility fixes from Arch Linux
    
    References:
    https://github.com/aubio/aubio/commit/245deeadd81afc4ec5635b65d71646490c5c19fd
    https://github.com/aubio/aubio/commit/0b947f9634937d27589d995ec90e90d763aca86f
    https://github.com/aubio/aubio/commit/53bc55cda4f0e106e63b8a993538fa4debf4bb66
    https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/blob/bdf858e4291aa170a23c470ac1caf2c827bfd01d/ffmpeg7.patch
    https://gitlab.archlinux.org/archlinux/packaging/packages/aubio/-/blob/bdf858e4291aa170a23c470ac1caf2c827bfd01d/PKGBUILD#L66
    
    PR:             289026
    Approved by:    maintainer timeout, 1+ month
---
 audio/aubio/Makefile                             | 13 ++++++++-----
 audio/aubio/distinfo                             | 12 +++++++++---
 audio/aubio/files/patch-src_io_source__avcodec.c | 22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index c43fac6ce148..1cacccf529d0 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -1,13 +1,16 @@
 PORTNAME=	aubio
-PORTVERSION=	0.4.9
-PORTREVISION?=	5
+DISTVERSION=	0.4.9
+PORTREVISION?=	6
 CATEGORIES?=	audio
 MASTER_SITES=	https://aubio.org/pub/
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES+=	cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch:-p1 #FFmpeg 6.x compat
-PATCHFILES+=	8a05420e5dd8c7b8b2447f82dc919765876511b3.patch:-p1 #FFmpeg 6.x compat
-PATCHFILES+=	95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch:-p1 #Add const qualifiers for NumPy >= 1.19.0
+PATCHFILES=	95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch:-p1 \
+		cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch:-p1 \
+		8a05420e5dd8c7b8b2447f82dc919765876511b3.patch:-p1 \
+		245deeadd81afc4ec5635b65d71646490c5c19fd.patch:-p1 \
+		0b947f9634937d27589d995ec90e90d763aca86f.patch:-p1 \
+		53bc55cda4f0e106e63b8a993538fa4debf4bb66.patch:-p1
 
 MAINTAINER?=	jhale@FreeBSD.org
 COMMENT?=	Library for audio labelling
diff --git a/audio/aubio/distinfo b/audio/aubio/distinfo
index 1a442677ac71..17b6b5456882 100644
--- a/audio/aubio/distinfo
+++ b/audio/aubio/distinfo
@@ -1,9 +1,15 @@
-TIMESTAMP = 1687726308
+TIMESTAMP = 1759995252
 SHA256 (aubio-0.4.9.tar.bz2) = d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da
 SIZE (aubio-0.4.9.tar.bz2) = 397604
+SHA256 (95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch) = 4f7a7f59b58fc2b4fc80378966455b7f7b3bea508f2e46c88b6521c084cbe9e4
+SIZE (95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch) = 1264
 SHA256 (cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch) = 025b6d0668601a17ce8312ad4930d7ba99715b754191208347df46b9a07b0a91
 SIZE (cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch) = 4743
 SHA256 (8a05420e5dd8c7b8b2447f82dc919765876511b3.patch) = 33b730d1aa0562d5cb96341fce268acb8a42a0381e9dcd52caef0fc2737b8ad0
 SIZE (8a05420e5dd8c7b8b2447f82dc919765876511b3.patch) = 729
-SHA256 (95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch) = 4f7a7f59b58fc2b4fc80378966455b7f7b3bea508f2e46c88b6521c084cbe9e4
-SIZE (95ff046c698156f21e2ca0d1d8a02c23ab76969f.patch) = 1264
+SHA256 (245deeadd81afc4ec5635b65d71646490c5c19fd.patch) = ed8b8c76867884ff97e7df6d6992c9df6fd6396f002e103f7718ab978daff417
+SIZE (245deeadd81afc4ec5635b65d71646490c5c19fd.patch) = 5012
+SHA256 (0b947f9634937d27589d995ec90e90d763aca86f.patch) = 1eb42cc2c51ca67ca6d54d2f223c3c3775041bf2743ccdddddd325e9365dc301
+SIZE (0b947f9634937d27589d995ec90e90d763aca86f.patch) = 3644
+SHA256 (53bc55cda4f0e106e63b8a993538fa4debf4bb66.patch) = e0d4ef1d61143130f919682b5288ad3030d9472f2c3b91d5c2703f9ec71e962d
+SIZE (53bc55cda4f0e106e63b8a993538fa4debf4bb66.patch) = 2197
diff --git a/audio/aubio/files/patch-src_io_source__avcodec.c b/audio/aubio/files/patch-src_io_source__avcodec.c
new file mode 100644
index 000000000000..c188f5288b57
--- /dev/null
+++ b/audio/aubio/files/patch-src_io_source__avcodec.c
@@ -0,0 +1,22 @@
+--- src/io/source_avcodec.c.orig	2025-10-09 07:49:13 UTC
++++ src/io/source_avcodec.c
+@@ -67,7 +67,7 @@
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
+ #else
+-#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE 16384
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR >= 59
+@@ -345,8 +345,8 @@ void aubio_source_avcodec_reset_resampler(aubio_source
+     av_channel_layout_default(&input_layout, s->input_channels);
+     av_channel_layout_default(&output_layout, s->input_channels);
+ 
+-    av_opt_set_chlayout(avr, "in_channel_layout",  &input_layout,        0);
+-    av_opt_set_chlayout(avr, "out_channel_layout", &output_layout,       0);
++    av_opt_set_chlayout(avr, "in_chlayout",  &input_layout,        0);
++    av_opt_set_chlayout(avr, "out_chlayout", &output_layout,       0);
+ #else
+     int64_t input_layout = av_get_default_channel_layout(s->input_channels);
+     int64_t output_layout = av_get_default_channel_layout(s->input_channels);