aubio: revbump for ffmpeg6

This commit is contained in:
zlice 2023-03-22 20:01:45 -04:00 committed by classabbyamp
parent 3bc63f0898
commit f8b201253a
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
3 changed files with 48 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 25 Jan 2022 18:30:27 +0100
Subject: [PATCH] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec >
59, thx @berolinux (closes gh-353)
---
src/io/source_avcodec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index e0ae93b5..1421bd9a 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;

View File

@ -0,0 +1,21 @@
--- a/waflib/Context.py 2024-06-04 07:49:13.399793819 -0400
+++ b/waflib/Context.py 2024-06-04 08:00:35.473824306 -0400
@@ -2,7 +2,7 @@
# encoding: utf-8
# WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file
-import os,re,imp,sys
+import os,re,types,sys
from waflib import Utils,Errors,Logs
import waflib.Node
HEXVERSION=0x2000e00
@@ -344,7 +344,7 @@
return cache_modules[path]
except KeyError:
pass
- module=imp.new_module(WSCRIPT_FILE)
+ module=types.ModuleType(WSCRIPT_FILE)
try:
code=Utils.readf(path,m='r',encoding=encoding)
except EnvironmentError:

View File

@ -1,11 +1,11 @@
# Template file for 'aubio'
pkgname=aubio
version=0.4.9
revision=1
revision=2
build_style=waf3
# XXX lash, pure and swig support.
hostmakedepends="pkg-config txt2man"
makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg-devel"
makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg6-devel"
short_desc="Library for audio labelling"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"