Bug#1004610: ffmpegthumbs: diff for NMU version 4:21.12.3-1.1

[Aurélien COUDERC]

Le dimanche 3 avril 2022, 20:22:47 CEST Sebastian Ramacher a écrit :
> Control: tags 1004610 + patch
> Control: tags 1004610 + pending
> 
> Dear maintainer,

Dear Sebastian,

> I've prepared an NMU for ffmpegthumbs (versioned as 4:21.12.3-1.1) and
> uploaded it to DELAYED/7. Please feel free to tell me if I
> should delay it longer.

Thank you, it looks fine, I’ve applied the diff to git.


Happy hacking !
--
Aurélien

Bug#1004610: ffmpegthumbs: diff for NMU version 4:21.12.3-1.1

[Sebastian Ramacher]

Control: tags 1004610 + patch
Control: tags 1004610 + pending

Dear maintainer,

I've prepared an NMU for ffmpegthumbs (versioned as 4:21.12.3-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru ffmpegthumbs-21.12.3/debian/changelog ffmpegthumbs-21.12.3/debian/changelog
--- ffmpegthumbs-21.12.3/debian/changelog	2022-03-06 17:16:43.0 +0100
+++ ffmpegthumbs-21.12.3/debian/changelog	2022-04-03 19:13:05.0 +0200
@@ -1,3 +1,10 @@
+ffmpegthumbs (4:21.12.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply upstream patch to fix build with ffmpeg 5.0 (Closes: #1004610)
+
+ -- Sebastian Ramacher   Sun, 03 Apr 2022 19:13:05 +0200
+
 ffmpegthumbs (4:21.12.3-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff -Nru ffmpegthumbs-21.12.3/debian/patches/ffmpeg-5.0.patch ffmpegthumbs-21.12.3/debian/patches/ffmpeg-5.0.patch
--- ffmpegthumbs-21.12.3/debian/patches/ffmpeg-5.0.patch	1970-01-01 01:00:00.0 +0100
+++ ffmpegthumbs-21.12.3/debian/patches/ffmpeg-5.0.patch	2022-04-03 19:11:39.0 +0200
@@ -0,0 +1,32 @@
+From fcec5f2ccae65fd4db2924ffec39cea2aba36e73 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+Date: Tue, 15 Mar 2022 23:58:34 +0100
+Subject: [PATCH] Fix build with FFmpeg 5
+
+AVCodec is const in FFmpeg 5
+
+BUG: 448776
+(cherry picked from commit d27049f9a62c63dd3898d8f7c5fff2244c13af86)
+---
+ ffmpegthumbnailer/moviedecoder.h | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
+index 502abe9..03eb6dd 100644
+--- a/ffmpegthumbnailer/moviedecoder.h
 b/ffmpegthumbnailer/moviedecoder.h
+@@ -57,7 +57,11 @@ private:
+ int m_VideoStream;
+ AVFormatContext*m_pFormatContext;
+ AVCodecContext* m_pVideoCodecContext;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ AVCodec*m_pVideoCodec;
++#else
++const AVCodec*  m_pVideoCodec;
++#endif
+ AVStream*   m_pVideoStream;
+ AVFrame*m_pFrame;
+ quint8* m_pFrameBuffer;
+-- 
+GitLab
+
diff -Nru ffmpegthumbs-21.12.3/debian/patches/series ffmpegthumbs-21.12.3/debian/patches/series
--- ffmpegthumbs-21.12.3/debian/patches/series	1970-01-01 01:00:00.0 +0100
+++ ffmpegthumbs-21.12.3/debian/patches/series	2022-04-03 19:12:15.0 +0200
@@ -0,0 +1 @@
+ffmpeg-5.0.patch


signature.asc
Description: PGP signature