Control: tags 1004787 + patch Control: tags 1004787 + pending Dear maintainer,
I've prepared an NMU for aubio (versioned as 0.4.9-4.2) and uploaded it to DELAYED/0 (:facepalm:, that was actually unintentional, but i guess it's too late now). Please feel free to tell me if I should delay it longer. Regards.
diff -Nru aubio-0.4.9/debian/changelog aubio-0.4.9/debian/changelog --- aubio-0.4.9/debian/changelog 2021-09-09 20:11:53.000000000 +0200 +++ aubio-0.4.9/debian/changelog 2022-06-30 22:35:01.000000000 +0200 @@ -1,3 +1,12 @@ +aubio (0.4.9-4.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to build against ffmpeg-5.0 (Closes: #1004787) + * Add salsa-ci configuration + * Call dh_numpy3 to add dependency on numpy abi + + -- IOhannes m zmölnig (Debian/GNU) <umlae...@debian.org> Thu, 30 Jun 2022 22:35:01 +0200 + aubio (0.4.9-4.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru aubio-0.4.9/debian/patches/ffmpeg5.patch aubio-0.4.9/debian/patches/ffmpeg5.patch --- aubio-0.4.9/debian/patches/ffmpeg5.patch 1970-01-01 01:00:00.000000000 +0100 +++ aubio-0.4.9/debian/patches/ffmpeg5.patch 2022-06-30 22:35:01.000000000 +0200 @@ -0,0 +1,20 @@ +Description: Fix compilation with ffmpeg-5.0 +Author: Paul Brossier +Origin: upstream +Applied-Upstream: https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3 +Last-Update: 2022-06-30 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- aubio.orig/src/io/source_avcodec.c ++++ aubio/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 -Nru aubio-0.4.9/debian/patches/series aubio-0.4.9/debian/patches/series --- aubio-0.4.9/debian/patches/series 2020-01-04 19:53:25.000000000 +0100 +++ aubio-0.4.9/debian/patches/series 2022-06-30 22:35:01.000000000 +0200 @@ -3,3 +3,4 @@ fixpowerpc.patch fixi386.patch wscript_py3.patch +ffmpeg5.patch diff -Nru aubio-0.4.9/debian/rules aubio-0.4.9/debian/rules --- aubio-0.4.9/debian/rules 2020-01-08 13:04:19.000000000 +0100 +++ aubio-0.4.9/debian/rules 2022-06-30 22:35:01.000000000 +0200 @@ -59,4 +59,4 @@ # python extension dh_auto_install --buildsystem=pybuild # call dh_numpy to add dependency on numpy abi - if [ -x /usr/bin/dh_numpy ]; then dh_numpy; fi + if [ -x /usr/bin/dh_numpy3 ]; then dh_numpy3; fi diff -Nru aubio-0.4.9/debian/salsa-ci.yml aubio-0.4.9/debian/salsa-ci.yml --- aubio-0.4.9/debian/salsa-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ aubio-0.4.9/debian/salsa-ci.yml 2022-06-30 22:35:01.000000000 +0200 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
