Merge ~liushuyu-011/ubuntu/+source/moc:ubuntu/devel into ubuntu/+source/moc:ubuntu/devel

[Zixing Liu]

This merge proposal fixes FTBFS for moc with FFmpeg 7.

[Graham Inggs (ginggs)]

Looks good to me, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f664cf2..679bdbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+moc (1:2.6.0~svn-r3005-3.1ubuntu1) oracular; urgency=medium
+
+  * d/p/1000-ffmpeg-7.0.patch: add a patch to fix build with FFmpeg 7
+
+ -- Zixing Liu <[e-mail]>  Tue, 17 Sep 2024 12:49:02 -0600
+
 moc (1:2.6.0~svn-r3005-3.1build5) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/1000-ffmpeg-7.0.patch b/debian/patches/1000-ffmpeg-7.0.patch
new file mode 100644
index 0000000..5329e0e
--- /dev/null
+++ b/debian/patches/1000-ffmpeg-7.0.patch
@@ -0,0 +1,47 @@
+Index: moc/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -562,10 +562,10 @@ static bool is_seek_broken (struct ffmpe
+ /* Downmix multi-channel audios to stereo. */
+ static void set_downmixing (struct ffmpeg_data *data)
+ {
+-	if (av_get_channel_layout_nb_channels (data->enc->channel_layout) <= 2)
++	if ((data->enc->ch_layout.nb_channels) <= 2)
+ 		return;
+ 
+-	data->enc->request_channel_layout = AV_CH_LAYOUT_STEREO;
++	av_channel_layout_from_mask(&data->enc->ch_layout, AV_CH_LAYOUT_STEREO);
+ }
+ 
+ static int ffmpeg_io_read_cb (void *s, uint8_t *buf, int count)
+@@ -1128,16 +1128,16 @@ static int decode_packet (struct ffmpeg_
+ 		is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
+ 		packed = (char *)frame->extended_data[0];
+ 		packed_size = frame->nb_samples * data->sample_width
+-		                                * data->enc->channels;
++		                                * data->enc->ch_layout.nb_channels;
+ 
+-		if (is_planar && data->enc->channels > 1) {
++		if (is_planar && data->enc->ch_layout.nb_channels > 1) {
+ 			int sample, ch;
+ 
+ 			packed = xmalloc (packed_size);
+ 
+ 			for (sample = 0; sample < frame->nb_samples; sample += 1) {
+-				for (ch = 0; ch < data->enc->channels; ch += 1)
+-					memcpy (packed + (sample * data->enc->channels + ch)
++				for (ch = 0; ch < data->enc->ch_layout.nb_channels; ch += 1)
++					memcpy (packed + (sample * data->enc->ch_layout.nb_channels + ch)
+ 					                         * data->sample_width,
+ 					        (char *)frame->extended_data[ch] + sample * data->sample_width,
+ 					        data->sample_width);
+@@ -1235,7 +1235,7 @@ static int ffmpeg_decode (void *prv_data
+ 		return 0;
+ 
+ 	/* FFmpeg claims to always return native endian. */
+-	sound_params->channels = data->enc->channels;
++	sound_params->channels = data->enc->ch_layout.nb_channels;
+ 	sound_params->rate = data->enc->sample_rate;
+ 	sound_params->fmt = data->fmt | SFMT_NE;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8cfe184..40209d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-Rename-configure.in-to-configure.ac.patch
 0009-Add-https-to-is_url.patch
 0010-ffmpeg-6.0.patch
+1000-ffmpeg-7.0.patch