Browse Source
Merge pull request #8279 from robho/squeezelite_bump
squeezelite: Bump to 1.9.1-1130lilik-openwrt-22.03
Ted Hess
6 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 123 additions and 295 deletions
Split View
Diff Options
-
+21 -24sound/squeezelite/Makefile
-
+0 -56sound/squeezelite/patches/005-respect_LDFLAGS.patch
-
+62 -61sound/squeezelite/patches/010-select_broadcast_interface.patch
-
+40 -35sound/squeezelite/patches/020-no_libmad.patch
-
+0 -14sound/squeezelite/patches/030-fix_musl_compatibilty.patch
-
+0 -105sound/squeezelite/patches/040-clear_dynlink_errors.patch
+ 21
- 24
sound/squeezelite/Makefile
View File
+ 0
- 56
sound/squeezelite/patches/005-respect_LDFLAGS.patch
View File
| @ -1,56 +0,0 @@ | |||
| From 1c53ed7db5b49ebf347efe65dbf9b740f9d54557 Mon Sep 17 00:00:00 2001 | |||
| From: Carlo Landmeter <clandmeter@gmail.com> | |||
| Date: Tue, 31 Mar 2015 09:52:53 +0000 | |||
| Subject: [PATCH] respect LDFLAGS | |||
| --- | |||
| Makefile | 17 +++++++++-------- | |||
| 1 file changed, 9 insertions(+), 8 deletions(-) | |||
| --- a/Makefile | |||
| +++ b/Makefile | |||
| @@ -1,6 +1,7 @@ | |||
| # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... | |||
| -CFLAGS ?= -Wall -fPIC -O2 $(OPTS) | |||
| -LDFLAGS ?= -lasound -lpthread -lm -lrt | |||
| +CFLAGS ?= -Wall -O2 | |||
| +CFLAGS += -fPIC $(OPTS) | |||
| +LIBS ?= -lasound -lpthread -lm -lrt | |||
| EXECUTABLE ?= squeezelite | |||
| # passing one or more of these in $(OPTS) enables optional feature inclusion | |||
| @@ -52,20 +53,20 @@ endif | |||
| # add optional link options | |||
| ifneq (,$(findstring $(OPT_LINKALL), $(CFLAGS))) | |||
| - LDFLAGS += $(LINKALL) | |||
| + LIBS += $(LINKALL) | |||
| ifneq (,$(findstring $(OPT_FF), $(CFLAGS))) | |||
| - LDFLAGS += $(LINKALL_FF) | |||
| + LIBS += $(LINKALL_FF) | |||
| endif | |||
| ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS))) | |||
| - LDFLAGS += $(LINKALL_RESAMPLE) | |||
| + LIBS += $(LINKALL_RESAMPLE) | |||
| endif | |||
| ifneq (,$(findstring $(OPT_IR), $(CFLAGS))) | |||
| - LDFLAGS += $(LINKALL_IR) | |||
| + LIBS += $(LINKALL_IR) | |||
| endif | |||
| else | |||
| # if not LINKALL and linux add LINK_LINUX | |||
| ifeq ($(UNAME), Linux) | |||
| - LDFLAGS += $(LINK_LINUX) | |||
| + LIBS += $(LINK_LINUX) | |||
| endif | |||
| endif | |||
| @@ -74,7 +75,7 @@ OBJECTS = $(SOURCES:.c=.o) | |||
| all: $(EXECUTABLE) | |||
| $(EXECUTABLE): $(OBJECTS) | |||
| - $(CC) $(OBJECTS) $(LDFLAGS) -o $@ | |||
| + $(CC) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $@ | |||
| $(OBJECTS): $(DEPS) | |||
+ 62
- 61
sound/squeezelite/patches/010-select_broadcast_interface.patch
View File
+ 40
- 35
sound/squeezelite/patches/020-no_libmad.patch
View File
| @ -1,83 +1,88 @@ | |||
| --- a/Makefile | |||
| +++ b/Makefile | |||
| @@ -15,7 +15,7 @@ OPT_IR = -DIR | |||
| Index: squeezelite-1.9.1-1130/Makefile | |||
| =================================================================== | |||
| --- squeezelite-1.9.1-1130.orig/Makefile | |||
| +++ squeezelite-1.9.1-1130/Makefile | |||
| @@ -17,7 +17,7 @@ OPT_NO_FAAD = -DNO_FAAD | |||
| SOURCES = \ | |||
| main.c slimproto.c buffer.c stream.c utils.c \ | |||
| output.c output_alsa.c output_pa.c output_stdout.c output_pack.c decode.c \ | |||
| - flac.c pcm.c mad.c vorbis.c faad.c mpg.c | |||
| + flac.c pcm.c vorbis.c faad.c mpg.c | |||
| - flac.c pcm.c mad.c vorbis.c mpg.c | |||
| + flac.c pcm.c vorbis.c mpg.c | |||
| SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c | |||
| SOURCES_FF = ffmpeg.c | |||
| @@ -25,7 +25,7 @@ SOURCES_IR = ir.c | |||
| @@ -30,7 +30,7 @@ SOURCES_FAAD = faad.c | |||
| LINK_LINUX = -ldl | |||
| LINK_RPI = -lwiringPi | |||
| -LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123 | |||
| +LINKALL = -lFLAC -lvorbisfile -lfaad -lmpg123 | |||
| -LINKALL = -lFLAC -lmad -lvorbisfile -lmpg123 | |||
| +LINKALL = -lFLAC -lvorbisfile -lmpg123 | |||
| LINKALL_FF = -lavcodec -lavformat -lavutil | |||
| LINKALL_RESAMPLE = -lsoxr | |||
| LINKALL_IR = -llirc_client | |||
| --- a/decode.c | |||
| +++ b/decode.c | |||
| @@ -145,8 +145,8 @@ void decode_init(log_level level, const | |||
| if (!strstr(exclude_codecs, "pcm") && (!include_codecs || strstr(include_codecs, "pcm"))) codecs[i++] = register_pcm(); | |||
| Index: squeezelite-1.9.1-1130/decode.c | |||
| =================================================================== | |||
| --- squeezelite-1.9.1-1130.orig/decode.c | |||
| +++ squeezelite-1.9.1-1130/decode.c | |||
| @@ -176,11 +176,7 @@ void decode_init(log_level level, const | |||
| if (!strstr(exclude_codecs, "pcm") && (!include_codecs || (order_codecs = strstr(include_codecs, "pcm")))) | |||
| sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_pcm()); | |||
| // try mad then mpg for mp3 unless command line option passed | |||
| - // try mad then mpg for mp3 unless command line option passed | |||
| - if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) && | |||
| - (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad(); | |||
| +// if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) && | |||
| +// (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad(); | |||
| if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] && | |||
| (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg(); | |||
| - (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mad")))) | |||
| - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mad()); | |||
| - else if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && | |||
| + if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && | |||
| (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mpg")))) | |||
| sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg()); | |||
| --- a/main.c | |||
| +++ b/main.c | |||
| @@ -39,7 +39,8 @@ | |||
| Index: squeezelite-1.9.1-1130/main.c | |||
| =================================================================== | |||
| --- squeezelite-1.9.1-1130.orig/main.c | |||
| +++ squeezelite-1.9.1-1130/main.c | |||
| @@ -44,7 +44,7 @@ | |||
| #else | |||
| #define CODECS_DSD "" | |||
| #endif | |||
| -#define CODECS_MP3 " (mad,mpg for specific mp3 codec)" | |||
| +//#define CODECS_MP3 " (mad,mpg for specific mp3 codec)" | |||
| +#define CODECS_MP3 " (mpg123 for specific mp3 codec)" | |||
| +#define CODECS_MP3 "" | |||
| #define CODECS CODECS_BASE CODECS_FF CODECS_DSD CODECS_MP3 | |||
| #define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_DSD CODECS_MP3 | |||
| --- a/squeezelite.h | |||
| +++ b/squeezelite.h | |||
| @@ -154,7 +154,7 @@ | |||
| Index: squeezelite-1.9.1-1130/squeezelite.h | |||
| =================================================================== | |||
| --- squeezelite-1.9.1-1130.orig/squeezelite.h | |||
| +++ squeezelite-1.9.1-1130/squeezelite.h | |||
| @@ -163,7 +163,6 @@ | |||
| #if LINUX | |||
| #define LIBFLAC "libFLAC.so.8" | |||
| -#define LIBMAD "libmad.so.0" | |||
| +//#define LIBMAD "libmad.so.0" | |||
| #define LIBMPG "libmpg123.so.0" | |||
| #define LIBVORBIS "libvorbisfile.so.3" | |||
| #define LIBTREMOR "libvorbisidec.so.1" | |||
| @@ -168,7 +168,7 @@ | |||
| @@ -177,7 +176,6 @@ | |||
| #if OSX | |||
| #define LIBFLAC "libFLAC.8.dylib" | |||
| -#define LIBMAD "libmad.0.dylib" | |||
| +//#define LIBMAD "libmad.0.dylib" | |||
| #define LIBMPG "libmpg123.0.dylib" | |||
| #define LIBVORBIS "libvorbisfile.3.dylib" | |||
| #define LIBTREMOR "libvorbisidec.1.dylib" | |||
| @@ -181,7 +181,7 @@ | |||
| @@ -190,7 +188,6 @@ | |||
| #if WIN | |||
| #define LIBFLAC "libFLAC.dll" | |||
| -#define LIBMAD "libmad-0.dll" | |||
| +//#define LIBMAD "libmad-0.dll" | |||
| #define LIBMPG "libmpg123-0.dll" | |||
| #define LIBVORBIS "libvorbisfile.dll" | |||
| #define LIBTREMOR "libvorbisidec.dll" | |||
| @@ -194,7 +194,7 @@ | |||
| @@ -203,7 +200,6 @@ | |||
| #if FREEBSD | |||
| #define LIBFLAC "libFLAC.so.11" | |||
| -#define LIBMAD "libmad.so.2" | |||
| +//#define LIBMAD "libmad.so.2" | |||
| #define LIBMPG "libmpg123.so.0" | |||
| #define LIBVORBIS "libvorbisfile.so.6" | |||
| #define LIBTREMOR "libvorbisidec.so.1" | |||
+ 0
- 14
sound/squeezelite/patches/030-fix_musl_compatibilty.patch
View File
| @ -1,14 +0,0 @@ | |||
| --- a/output_alsa.c | |||
| +++ b/output_alsa.c | |||
| @@ -911,8 +911,11 @@ void output_init_alsa(log_level level, c | |||
| LOG_INFO("memory locked"); | |||
| } | |||
| +#ifdef M_TRIM_THRESHOLD | |||
| + // mallopt is not defined in musl libc | |||
| mallopt(M_TRIM_THRESHOLD, -1); | |||
| mallopt(M_MMAP_MAX, 0); | |||
| +#endif | |||
| touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME); | |||
| touch_memory(outputbuf->buf, outputbuf->size); | |||
+ 0
- 105
sound/squeezelite/patches/040-clear_dynlink_errors.patch
View File
| @ -1,105 +0,0 @@ | |||
| --- a/faad.c | |||
| +++ b/faad.c | |||
| @@ -594,6 +594,8 @@ static bool load_faad() { | |||
| return false; | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| a->NeAACDecGetCurrentConfiguration = dlsym(handle, "NeAACDecGetCurrentConfiguration"); | |||
| a->NeAACDecSetConfiguration = dlsym(handle, "NeAACDecSetConfiguration"); | |||
| a->NeAACDecOpen = dlsym(handle, "NeAACDecOpen"); | |||
| --- a/ffmpeg.c | |||
| +++ b/ffmpeg.c | |||
| @@ -620,6 +620,8 @@ static bool load_ff() { | |||
| return false; | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| sprintf(name, LIBAVFORMAT, LIBAVFORMAT_VERSION_MAJOR); | |||
| handle_format = dlopen(name, RTLD_NOW); | |||
| if (!handle_format) { | |||
| --- a/flac.c | |||
| +++ b/flac.c | |||
| @@ -241,6 +241,8 @@ static bool load_flac() { | |||
| return false; | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| f->FLAC__StreamDecoderErrorStatusString = dlsym(handle, "FLAC__StreamDecoderErrorStatusString"); | |||
| f->FLAC__StreamDecoderStateString = dlsym(handle, "FLAC__StreamDecoderStateString"); | |||
| f->FLAC__stream_decoder_new = dlsym(handle, "FLAC__stream_decoder_new"); | |||
| --- a/ir.c | |||
| +++ b/ir.c | |||
| @@ -168,10 +168,10 @@ static void *ir_thread() { | |||
| UNLOCK_I; | |||
| wake_controller(); | |||
| } | |||
| - | |||
| + | |||
| free(code); | |||
| } | |||
| - | |||
| + | |||
| return 0; | |||
| } | |||
| @@ -185,6 +185,8 @@ static bool load_lirc() { | |||
| return false; | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| i->lirc_init = dlsym(handle, "lirc_init"); | |||
| i->lirc_deinit = dlsym(handle, "lirc_deinit"); | |||
| i->lirc_readconfig = dlsym(handle, "lirc_readconfig"); | |||
| --- a/mad.c | |||
| +++ b/mad.c | |||
| @@ -365,7 +365,9 @@ static bool load_mad() { | |||
| LOG_INFO("dlerror: %s", dlerror()); | |||
| return false; | |||
| } | |||
| - | |||
| + | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| m->mad_stream_init = dlsym(handle, "mad_stream_init"); | |||
| m->mad_frame_init = dlsym(handle, "mad_frame_init"); | |||
| m->mad_synth_init = dlsym(handle, "mad_synth_init"); | |||
| --- a/mpg.c | |||
| +++ b/mpg.c | |||
| @@ -222,7 +222,9 @@ static bool load_mpg() { | |||
| LOG_INFO("dlerror: %s", dlerror()); | |||
| return false; | |||
| } | |||
| - | |||
| + | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| m->mpg123_init = dlsym(handle, "mpg123_init"); | |||
| m->mpg123_feature = dlsym(handle, "mpg123_feature"); | |||
| m->mpg123_rates = dlsym(handle, "mpg123_rates"); | |||
| --- a/resample.c | |||
| +++ b/resample.c | |||
| @@ -251,6 +251,8 @@ static bool load_soxr(void) { | |||
| return false; | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| r->soxr_io_spec = dlsym(handle, "soxr_io_spec"); | |||
| r->soxr_quality_spec = dlsym(handle, "soxr_quality_spec"); | |||
| r->soxr_create = dlsym(handle, "soxr_create"); | |||
| --- a/vorbis.c | |||
| +++ b/vorbis.c | |||
| @@ -287,6 +287,8 @@ static bool load_vorbis() { | |||
| } | |||
| } | |||
| + err = dlerror(); // Reset previous dynamic linking error string (if there was) | |||
| + | |||
| v->ov_read = tremor ? NULL : dlsym(handle, "ov_read"); | |||
| v->ov_read_tremor = tremor ? dlsym(handle, "ov_read") : NULL; | |||
| v->ov_info = dlsym(handle, "ov_info"); | |||