rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
bsp/buildroot/package/squeezelite/0003-ffmpeg_2_9.patch Normal file
View File

@@ -0,0 +1,57 @@
Fix compilation with ffmpeg >= 2.9
Downloaded from Debian:
https://sources.debian.net/src/squeezelite/1.8-3/debian/patches/ffmpeg_2.9.patch/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
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
@@ -52,8 +52,8 @@ struct ff_s {
unsigned (* avcodec_version)(void);
AVCodec * (* avcodec_find_decoder)(int);
int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **);
- AVFrame * (* avcodec_alloc_frame)(void);
- void (* avcodec_free_frame)(AVFrame **);
+ AVFrame * (* av_frame_alloc)(void);
+ void (* av_frame_free)(AVFrame **);
int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *);
// ffmpeg symbols to be dynamically loaded from libavformat
unsigned (* avformat_version)(void);
@@ -324,7 +324,7 @@ static decode_state ff_decode(void) {
AVCODEC(ff, open2, ff->codecC, codec, NULL);
- ff->frame = AVCODEC(ff, alloc_frame);
+ ff->frame = AV(ff, frame_alloc);
ff->avpkt = AV(ff, malloc, sizeof(AVPacket));
if (ff->avpkt == NULL) {
@@ -520,9 +520,9 @@ static void _free_ff_data(void) {
if (ff->frame) {
// ffmpeg version dependant free function
#if !LINKALL
- ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame);
+ ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame);
#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0)
- AVCODEC(ff, free_frame, &ff->frame);
+ AV(ff, frame_free, &ff->frame);
#else
AV(ff, freep, &ff->frame);
#endif
@@ -607,8 +607,8 @@ static bool load_ff() {
ff->avcodec_version = dlsym(handle_codec, "avcodec_version");
ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder");
ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2");
- ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame");
- ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame");
+ ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc");
+ ff->av_frame_free = dlsym(handle_codec, "av_frame_free");
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");

8
bsp/buildroot/package/squeezelite/Config.in
View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_SQUEEZELITE
bool "squeezelite"
depends on BR2_USE_WCHAR # flac
depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_USE_MMU # mpg123
depends on !BR2_STATIC_LIBS # dlopen
select BR2_PACKAGE_ALSA_LIB
@@ -21,8 +21,8 @@ if BR2_PACKAGE_SQUEEZELITE
config BR2_PACKAGE_SQUEEZELITE_FFMPEG
bool "Enable WMA and ALAC decoding"
default y
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
select BR2_PACKAGE_FFMPEG
depends on !BR2_nios2 # ffmpeg
config BR2_PACKAGE_SQUEEZELITE_DSD
bool "Enable DSD decoding"
@@ -36,7 +36,7 @@ config BR2_PACKAGE_SQUEEZELITE_VISEXPORT
endif
comment "squeezelite needs a toolchain w/ wchar, threads, dynamic library"
comment "squeezelite needs a toolchain w/ wchar, NPTL, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|| BR2_STATIC_LIBS