NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/squeezelite: fix build with FFmpeg 4.0

Browse Source 
Git-formatted patch 0003.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2018-08-25 09:31:17 +02:00 committed by Thomas Petazzoni
parent 0b1794cb43
commit 45841bd443
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/squeezelite/0003-ffmpeg_2_9.patch → package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch
View File

@ -1,17 +1,22 @@
Fix compilation with ffmpeg >= 2.9
From cce6a0378ac319b87d2545d73f593d440bf686f5 Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Date: Sat, 18 Aug 2018 13:25:23 +0200
Subject: [PATCH] Replace deprecated FFmpeg API
Fixes compilation with ffmpeg >= 2.9.
Downloaded from Debian:
https://sources.debian.net/src/squeezelite/1.8-3/debian/patches/ffmpeg_2.9.patch/
https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg_2.9.patch/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
ffmpeg.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Last-Update: <2015-11-02>
--- squeezelite-1.8.orig/ffmpeg.c
+++ squeezelite-1.8/ffmpeg.c
diff --git a/ffmpeg.c b/ffmpeg.c
index 279f31d..bc9136c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -52,8 +52,8 @@ struct ff_s {
unsigned (* avcodec_version)(void);
AVCodec * (* avcodec_find_decoder)(int);
@ -55,3 +60,6 @@ Last-Update: <2015-11-02>
ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4");
ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
--
2.18.0

31
package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch Normal file
View File

@ -0,0 +1,31 @@
From 4ad37284447e768d641768c7c8a69c4640c83181 Mon Sep 17 00:00:00 2001
From: James Cowgill <jcowgill@debian.org>
Date: Sat, 18 Aug 2018 13:26:59 +0200
Subject: [PATCH] Fix FTBFS with FFmpeg 4.0
Bug-Debian: https://bugs.debian.org/888335
Downloaded from Debian:
https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg4.0.patch/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index bc9136c..d51b08e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -264,7 +264,7 @@ static decode_state ff_decode(void) {
ff->mmsh_bytes_left = ff->mmsh_bytes_pad = ff->mmsh_packet_len = 0;
if (!ff->readbuf) {
- ff->readbuf = AV(ff, malloc, READ_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+ ff->readbuf = AV(ff, malloc, READ_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
}
avio = AVIO(ff, alloc_context, ff->readbuf, READ_SIZE, 0, NULL, _read_data, NULL, NULL);
--
2.18.0