Control: tag -1 upstream Control: forwarded -1 https://github.com/ammen99/wf-recorder/pull/262
On zondag 2 juni 2024 15:27:52 CEST you wrote: > Source: wf-recorder > Version: 0.4.1-1 > Severity: important > Tags: trixie sid ftbfs > Usertags: ffmpeg-7.0 > > during a rebuild of the reverse dependencies for the transition to > ffmpeg 7.0, your package failed to build With the attached patch (taken from upstream PR, but adapted for Debian packaging) it builds successfully against ffmpeg 7.0 (as well as 6.1). Although ... for some reason the reprotest failed as it was unable to fulfill the `ffmpeg (>= 7:7.0)` B-D in that job. Setting Salsa's CI release to "experimental" didn't make it use ffmpeg from experimental, so 'forced' it via an updated B-D, which worked ... for the most part. Therefor I'm not adding the 'patch' tag. https://salsa.debian.org/diederik/wf-recorder/-/pipelines/685183 HTH, Diederik
>From 0cd5917c9e1ee46685119922e3ec2d5392dccbf1 Mon Sep 17 00:00:00 2001 From: Diederik de Haas <didi.deb...@cknow.org> Date: Sun, 2 Jun 2024 15:47:16 +0200 Subject: [PATCH] d/patches: Add ffmpeg 7.0 compatibility There's an upstream PR for ffmpeg 7.0 compatibility, so add the patch from that PR to ``debian/patches``. Closes: #1072458 Link: https://github.com/ammen99/wf-recorder/pull/262 --- debian/patches/ffmpeg-7-compat-pr262.patch | 109 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 110 insertions(+) create mode 100644 debian/patches/ffmpeg-7-compat-pr262.patch create mode 100644 debian/patches/series diff --git a/debian/patches/ffmpeg-7-compat-pr262.patch b/debian/patches/ffmpeg-7-compat-pr262.patch new file mode 100644 index 0000000..432ecf3 --- /dev/null +++ b/debian/patches/ffmpeg-7-compat-pr262.patch @@ -0,0 +1,109 @@ +From 239829231e6bf5da30c43413491a0a195b84101d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebo...@gmail.com> +Date: Mon, 6 May 2024 17:03:08 +0200 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 +Origin: upstream, https://github.com/ammen99/wf-recorder/pull/262 + +channel_layout has been replaced with ch_layout +--- + src/frame-writer.cpp | 38 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +diff --git a/src/frame-writer.cpp b/src/frame-writer.cpp +index ad21e49..2bd9d51 100644 +--- a/src/frame-writer.cpp ++++ b/src/frame-writer.cpp +@@ -12,6 +12,7 @@ + #include "averr.h" + #include <gbm.h> + ++#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + + static const AVRational US_RATIONAL{1,1000000} ; + +@@ -446,6 +447,22 @@ void FrameWriter::init_video_stream() + } + + #ifdef HAVE_PULSE ++#if HAVE_CH_LAYOUT ++static uint64_t get_codec_channel_layout(const AVCodec *codec) ++{ ++ int i = 0; ++ if (!codec->ch_layouts) ++ return AV_CH_LAYOUT_STEREO; ++ while (1) { ++ if (!av_channel_layout_check(&codec->ch_layouts[i])) ++ break; ++ if (codec->ch_layouts[i].u.mask == AV_CH_LAYOUT_STEREO) ++ return codec->ch_layouts[i].u.mask; ++ i++; ++ } ++ return codec->ch_layouts[0].u.mask; ++} ++#else + static uint64_t get_codec_channel_layout(const AVCodec *codec) + { + int i = 0; +@@ -460,6 +477,7 @@ static uint64_t get_codec_channel_layout(const AVCodec *codec) + } + return codec->channel_layouts[0]; + } ++#endif + + static enum AVSampleFormat get_codec_auto_sample_fmt(const AVCodec *codec) + { +@@ -533,10 +551,14 @@ void FrameWriter::init_audio_stream() + { + audioCodecCtx->sample_fmt = convert_codec_sample_fmt(codec, params.sample_fmt); + } ++#if HAVE_CH_LAYOUT ++ av_channel_layout_from_mask(&audioCodecCtx->ch_layout, get_codec_channel_layout(codec)); ++#else + audioCodecCtx->channel_layout = get_codec_channel_layout(codec); ++ audioCodecCtx->channels = av_get_channel_layout_nb_channels(audioCodecCtx->channel_layout); ++#endif + audioCodecCtx->sample_rate = params.sample_rate; + audioCodecCtx->time_base = (AVRational) { 1, 1000 }; +- audioCodecCtx->channels = av_get_channel_layout_nb_channels(audioCodecCtx->channel_layout); + + if (fmtCtx->oformat->flags & AVFMT_GLOBALHEADER) + audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; +@@ -559,8 +581,14 @@ void FrameWriter::init_audio_stream() + av_opt_set_int(swrCtx, "out_sample_rate", audioCodecCtx->sample_rate, 0); + av_opt_set_sample_fmt(swrCtx, "in_sample_fmt", AV_SAMPLE_FMT_FLT, 0); + av_opt_set_sample_fmt(swrCtx, "out_sample_fmt", audioCodecCtx->sample_fmt, 0); ++#if HAVE_CH_LAYOUT ++ AVChannelLayout in_chlayout = AV_CHANNEL_LAYOUT_STEREO; ++ av_opt_set_chlayout(swrCtx, "in_chlayout", &in_chlayout, 0); ++ av_opt_set_chlayout(swrCtx, "out_chlayout", &audioCodecCtx->ch_layout, 0); ++#else + av_opt_set_channel_layout(swrCtx, "in_channel_layout", AV_CH_LAYOUT_STEREO, 0); + av_opt_set_channel_layout(swrCtx, "out_channel_layout", audioCodecCtx->channel_layout, 0); ++#endif + + if (swr_init(swrCtx)) + { +@@ -850,7 +878,11 @@ void FrameWriter::add_audio(const void* buffer) + AVFrame *inputf = av_frame_alloc(); + inputf->sample_rate = params.sample_rate; + inputf->format = AV_SAMPLE_FMT_FLT; ++#if HAVE_CH_LAYOUT ++ inputf->ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO; ++#else + inputf->channel_layout = AV_CH_LAYOUT_STEREO; ++#endif + inputf->nb_samples = audioCodecCtx->frame_size; + + av_frame_get_buffer(inputf, 0); +@@ -859,7 +891,11 @@ void FrameWriter::add_audio(const void* buffer) + AVFrame *outputf = av_frame_alloc(); + outputf->format = audioCodecCtx->sample_fmt; + outputf->sample_rate = audioCodecCtx->sample_rate; ++#if HAVE_CH_LAYOUT ++ av_channel_layout_copy(&outputf->ch_layout, &audioCodecCtx->ch_layout); ++#else + outputf->channel_layout = audioCodecCtx->channel_layout; ++#endif + outputf->nb_samples = audioCodecCtx->frame_size; + av_frame_get_buffer(outputf, 0); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5598dfc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +ffmpeg-7-compat-pr262.patch -- 2.45.1
signature.asc
Description: This is a digitally signed message part.
