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

[Zixing Liu]

This merge proposal adds a patch to fix FTBFS issue with FFmpeg 7

[Vladimir Petko (vpa1977)]

- Please add the patch header as it is not clear where the patch is coming from. Note, please forward it upstream if it is ours.
- Please add ftbfs bug and reference it in the changelog/patch

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

> - Please add the patch header as it is not clear where the patch is coming from. Note, please forward it upstream if it is ours.

I will mark it as "not-needed" as our OpenBoard is a severely outdated version.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16242582/+listing-archive-extra

[Vladimir Petko (vpa1977)]

review: Approve

[Vladimir Petko (vpa1977)]

Note: fixed bug-debian reference to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1080949 on upload

[Vladimir Petko (vpa1977)]

Could not upload, there is already ubuntu2 sitting in the queue.

0a6e7b9... by Gianfranco Costamagna on 2024-09-25

changelog

[Vladimir Petko (vpa1977)]

Uploaded, thank you!!!

diff --git a/debian/changelog b/debian/changelog
index ace4dd3..121d43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openboard (1.6.4+dfsg-1ubuntu3) oracular; urgency=medium
+
+  * d/p/2011_ffmpeg-7.patch: add a patch to fix FTBFS with ffmpeg 7
+    (LP: #2079134).
+
+ -- Zixing Liu <[e-mail]>  Tue, 17 Sep 2024 15:12:19 -0600
+
+openboard (1.6.4+dfsg-1ubuntu2) oracular; urgency=medium
+
+  * Rebuild against new libavcodec61.
+
+ -- Gianfranco Costamagna <[e-mail]>  Wed, 31 Jul 2024 17:19:45 +0200
+
 openboard (1.6.4+dfsg-1ubuntu1) oracular; urgency=medium
 
   * Fix FTBFS with new poppler 24.06 (LP: #2070403):
diff --git a/debian/patches/2011_ffmpeg-7.patch b/debian/patches/2011_ffmpeg-7.patch
new file mode 100644
index 0000000..5e8af21
--- /dev/null
+++ b/debian/patches/2011_ffmpeg-7.patch
@@ -0,0 +1,27 @@
+Description: Fix build with FFmpeg 7
+Author: Nicola Ferralis <[e-mail]>
+Bug-Debian: https://bugs.launchpad.net/debian/+source/openboard
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openboard/+bug/2079134
+Forwarded: not-needed
+Last-Update: 2024-09-20
+---
+--- openboard-1.6.4+dfsg.orig/src/podcast/ffmpeg/UBFFmpegVideoEncoder.cpp
++++ openboard-1.6.4+dfsg/src/podcast/ffmpeg/UBFFmpegVideoEncoder.cpp
+@@ -520,7 +520,7 @@ bool UBFFmpegVideoEncoder::init()
+         }
+ 
+         // Buffer for resampled/converted audio
+-        mAudioOutBuffer = av_audio_fifo_alloc(c->sample_fmt, c->channels, c->frame_size);
++        mAudioOutBuffer = av_audio_fifo_alloc(c->sample_fmt, c->ch_layout.nb_channels, c->frame_size);
+     }
+ 
+ 
+@@ -640,7 +640,7 @@ void UBFFmpegVideoEncoder::processAudio(
+     int outSamplesLineSize;
+ 
+     ret = av_samples_alloc_array_and_samples(&outSamples, &outSamplesLineSize,
+-                                             codecContext->channels, outSamplesCount,
++                                             codecContext->ch_layout.nb_channels, outSamplesCount,
+                                              codecContext->sample_fmt, 0);
+     if (ret < 0) {
+         qWarning() << "Could not allocate audio samples" << avErrorToQString(ret);
diff --git a/debian/patches/series b/debian/patches/series
index 1a681fe..5fc238b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 1009_various-typo-fixes.patch
 2010_fix-poppler2406-build.patch
 0001_ffmpeg-5.patch
+2011_ffmpeg-7.patch