Bug#1072424: janus: diff for NMU version 1.1.2-1.1

[Gianfranco Costamagna]

Control: tags 1072424 + patch
Control: tags 1072424 + pending


Dear maintainer,

I've prepared an NMU for janus (versioned as 1.1.2-1.1) and
uploaded it.

Regards.

diff -Nru janus-1.1.2/debian/changelog janus-1.1.2/debian/changelog
--- janus-1.1.2/debian/changelog        2023-01-19 09:09:02.000000000 +0100
+++ janus-1.1.2/debian/changelog        2025-02-17 11:53:59.000000000 +0100
@@ -1,3 +1,13 @@
+janus (1.1.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Zixing Liu <zixing.liu at canonical.com> ]
+  * d/p/2010_fix_ffmpeg_7.patch: fix FTBFS with FFmpeg 7
+    (Closes: #1072424)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 17 Feb 2025 11:53:59 +0100
+
  janus (1.1.2-1) unstable; urgency=medium

    [ upstream ]
diff -Nru janus-1.1.2/debian/patches/2010_fix_ffmpeg_7.patch janus-1.1.2/debian/patches/2010_fix_ffmpeg_7.patch
--- janus-1.1.2/debian/patches/2010_fix_ffmpeg_7.patch  1970-01-01 01:00:00.000000000 +0100
+++ janus-1.1.2/debian/patches/2010_fix_ffmpeg_7.patch  2024-09-17 21:01:53.000000000 +0200
@@ -0,0 +1,27 @@
+Description: Fix FTBFS with FFmpeg 7
+Author: Zixing Liu <zixing.liu at canonical.com>
+Forwarded: no
+Last-Update: 2024-09-17
+---
+--- janus-1.1.2.orig/src/postprocessing/pp-avformat.c
++++ janus-1.1.2/src/postprocessing/pp-avformat.c
+@@ -64,7 +64,7 @@ AVStream *janus_pp_new_audio_avstream(AV
+       c->codec_id = codec_id;
+       c->codec_type = AVMEDIA_TYPE_AUDIO;
+       c->sample_rate = samplerate;
+-      c->channels = channels;
++      av_channel_layout_default(&c->ch_layout, channels);
+       if(extradata) {
+               c->extradata_size = size;
+               c->extradata = av_memdup(extradata, size);
+--- janus-1.1.2.orig/src/postprocessing/pp-g722.c
++++ janus-1.1.2/src/postprocessing/pp-g722.c
+@@ -212,7 +212,7 @@ int janus_pp_g722_process(FILE *file, ja
+                               int data_size = av_get_bytes_per_sample(dec_ctx->sample_fmt);
+                               int i=0, ch=0;
+                               for(i=0; i<frame->nb_samples; i++) {
+-                                      for(ch=0; ch<dec_ctx->channels; ch++) {
++                                      for(ch=0; ch<dec_ctx->ch_layout.nb_channels; ch++) {
+                                               fwrite(frame->data[ch] + data_size*i, 1, data_size, wav_file);
+                                       }
+                               }
diff -Nru janus-1.1.2/debian/patches/series janus-1.1.2/debian/patches/series
--- janus-1.1.2/debian/patches/series   2022-12-08 11:25:48.000000000 +0100
+++ janus-1.1.2/debian/patches/series   2025-02-17 11:53:33.000000000 +0100
@@ -11,3 +11,4 @@
  2007_use_shared_janus.patch
  2008_avoid_virtualbg.patch
  2009_rollup_3.patch
+2010_fix_ffmpeg_7.patch