From 6d1fec252b8ec853f91abe064227647537b0bc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 1 Mar 2022 18:46:47 +0100 Subject: [PATCH] aubio: Fix build with ffmpeg 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ..._FF_API_LAVF_AVCTX_for_libavcodec_59.patch | 27 +++++++++++++++++++ recipes-musicians/aubio/aubio_0.4.9.bb | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 recipes-musicians/aubio/aubio/0003-define_FF_API_LAVF_AVCTX_for_libavcodec_59.patch diff --git a/recipes-musicians/aubio/aubio/0003-define_FF_API_LAVF_AVCTX_for_libavcodec_59.patch b/recipes-musicians/aubio/aubio/0003-define_FF_API_LAVF_AVCTX_for_libavcodec_59.patch new file mode 100644 index 0000000..4a33856 --- /dev/null +++ b/recipes-musicians/aubio/aubio/0003-define_FF_API_LAVF_AVCTX_for_libavcodec_59.patch @@ -0,0 +1,27 @@ +From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001 +From: Paul Brossier +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) + + +Upstream-Status: Accepted[https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3] +--- + 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; diff --git a/recipes-musicians/aubio/aubio_0.4.9.bb b/recipes-musicians/aubio/aubio_0.4.9.bb index 9592bec..daf6d24 100644 --- a/recipes-musicians/aubio/aubio_0.4.9.bb +++ b/recipes-musicians/aubio/aubio_0.4.9.bb @@ -1,6 +1,6 @@ SUMMARY = "aubio is designed for the extraction of annotations from audio signals" HOMEPAGE = "https://aubio.org/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit waf pkgconfig @@ -17,8 +17,8 @@ SRC_URI = " \ https://aubio.org/pub/${BPN}-${PV}.tar.bz2 \ file://0001-do-not-build-tests.patch \ file://0002-Fix-build-for-python3-only-environments.patch \ + file://0003-define_FF_API_LAVF_AVCTX_for_libavcodec_59.patch \ " -SRC_URI[md5sum] = "50c9c63b15a2692378af5d602892f16a" SRC_URI[sha256sum] = "d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da" EXTRA_OECONF = " \