Codebase list squeezelite / 54c4b70
Remove patches applied upstream tony mancill 2 years ago
5 changed file(s) with 0 addition(s) and 204 deletion(s). Raw diff Collapse all Expand all
+0
-48
debian/patches/Makefile-portaudio.patch less more
0 Description: Simplify building of PortAudio based binary
1
2 This Makefile patch conditionally adds libasound or libportaudio to the build
3 flags depending on whether -DPORTAUDIO is included in CFLAGS.
4
5 Author: Chris Boot <bootc@debian.org>
6 Forwarded: no
7 Last-Update: 2013-12-28
8
9 --- a/Makefile
10 +++ b/Makefile
11 @@ -1,12 +1,13 @@
12 # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile...
13 CFLAGS ?= -Wall -fPIC -O2
14 -LDADD ?= -lasound -lpthread -lm -lrt
15 +LDADD ?= -lpthread -lm -lrt
16 EXECUTABLE ?= squeezelite
17
18 # passing one or more of these in $(OPTS) enables optional feature inclusion
19 OPT_DSD = -DDSD
20 OPT_FF = -DFFMPEG
21 OPT_LINKALL = -DLINKALL
22 +OPT_PORTAUDIO = -DPORTAUDIO
23 OPT_RESAMPLE= -DRESAMPLE
24 OPT_VIS = -DVISEXPORT
25 OPT_IR = -DIR
26 @@ -23,6 +24,8 @@
27 SOURCES_IR = ir.c
28
29 LINK_LINUX = -ldl
30 +LINK_ALSA = -lasound
31 +LINK_PORTAUDIO = -lportaudio
32
33 LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123
34 LINKALL_FF = -lavcodec -lavformat -lavutil
35 @@ -69,6 +72,12 @@
36 endif
37 endif
38
39 +ifneq (,$(findstring $(OPT_PORTAUDIO), $(OPTS)))
40 + LDADD += $(LINK_PORTAUDIO)
41 +else
42 + LDADD += $(LINK_ALSA)
43 +endif
44 +
45 OBJECTS = $(SOURCES:.c=.o)
46
47 all: $(EXECUTABLE)
+0
-87
debian/patches/Makefile-tweaks.patch less more
0 Description: Makefile tweaks for hardening build options
1 This patch changes the Makefile to add options to CFLAGS and LDFLAGS instead of
2 overriding the values from the environment, and ensures that CPPFLAGS is also
3 used when building C source.
4 Author: Chris Boot <bootc@debian.org>
5 Forwarded: not-needed
6 Last-Update: 2013-12-28
7
8 --- a/Makefile
9 +++ b/Makefile
10 @@ -1,6 +1,6 @@
11 # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile...
12 -CFLAGS ?= -Wall -fPIC -O2 $(OPTS)
13 -LDFLAGS ?= -lasound -lpthread -lm -lrt
14 +CFLAGS ?= -Wall -fPIC -O2
15 +LDADD ?= -lasound -lpthread -lm -lrt
16 EXECUTABLE ?= squeezelite
17
18 # passing one or more of these in $(OPTS) enables optional feature inclusion
19 @@ -34,38 +34,38 @@
20 UNAME = $(shell uname -s)
21
22 # add optional sources
23 -ifneq (,$(findstring $(OPT_DSD), $(CFLAGS)))
24 +ifneq (,$(findstring $(OPT_DSD), $(OPTS)))
25 SOURCES += $(SOURCES_DSD)
26 endif
27 -ifneq (,$(findstring $(OPT_FF), $(CFLAGS)))
28 +ifneq (,$(findstring $(OPT_FF), $(OPTS)))
29 SOURCES += $(SOURCES_FF)
30 endif
31 -ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS)))
32 +ifneq (,$(findstring $(OPT_RESAMPLE), $(OPTS)))
33 SOURCES += $(SOURCES_RESAMPLE)
34 endif
35 -ifneq (,$(findstring $(OPT_VIS), $(CFLAGS)))
36 +ifneq (,$(findstring $(OPT_VIS), $(OPTS)))
37 SOURCES += $(SOURCES_VIS)
38 endif
39 -ifneq (,$(findstring $(OPT_IR), $(CFLAGS)))
40 +ifneq (,$(findstring $(OPT_IR), $(OPTS)))
41 SOURCES += $(SOURCES_IR)
42 endif
43
44 # add optional link options
45 -ifneq (,$(findstring $(OPT_LINKALL), $(CFLAGS)))
46 - LDFLAGS += $(LINKALL)
47 -ifneq (,$(findstring $(OPT_FF), $(CFLAGS)))
48 - LDFLAGS += $(LINKALL_FF)
49 +ifneq (,$(findstring $(OPT_LINKALL), $(OPTS)))
50 + LDADD += $(LINKALL)
51 +ifneq (,$(findstring $(OPT_FF), $(OPTS)))
52 + LDADD += $(LINKALL_FF)
53 endif
54 -ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS)))
55 - LDFLAGS += $(LINKALL_RESAMPLE)
56 +ifneq (,$(findstring $(OPT_RESAMPLE), $(OPTS)))
57 + LDADD += $(LINKALL_RESAMPLE)
58 endif
59 -ifneq (,$(findstring $(OPT_IR), $(CFLAGS)))
60 - LDFLAGS += $(LINKALL_IR)
61 +ifneq (,$(findstring $(OPT_IR), $(OPTS)))
62 + LDADD += $(LINKALL_IR)
63 endif
64 else
65 # if not LINKALL and linux add LINK_LINUX
66 ifeq ($(UNAME), Linux)
67 - LDFLAGS += $(LINK_LINUX)
68 + LDADD += $(LINK_LINUX)
69 endif
70 endif
71
72 @@ -74,12 +74,12 @@
73 all: $(EXECUTABLE)
74
75 $(EXECUTABLE): $(OBJECTS)
76 - $(CC) $(OBJECTS) $(LDFLAGS) -o $@
77 + $(CC) $(OBJECTS) $(LDFLAGS) $(LDADD) -o $@
78
79 $(OBJECTS): $(DEPS)
80
81 .c.o:
82 - $(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@
83 + $(CC) $(CFLAGS) $(CPPFLAGS) $(OPTS) $< -c -o $@
84
85 clean:
86 rm -f $(OBJECTS) $(EXECUTABLE)
+0
-16
debian/patches/ffmpeg4.0.patch less more
0 Description: Fix FTBFS with FFmpeg 4.0
1 Author: James Cowgill <jcowgill@debian.org>
2 Bug-Debian: https://bugs.debian.org/888335
3 ---
4 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
5 --- a/ffmpeg.c
6 +++ b/ffmpeg.c
7 @@ -264,7 +264,7 @@ static decode_state ff_decode(void) {
8 ff->mmsh_bytes_left = ff->mmsh_bytes_pad = ff->mmsh_packet_len = 0;
9
10 if (!ff->readbuf) {
11 - ff->readbuf = AV(ff, malloc, READ_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
12 + ff->readbuf = AV(ff, malloc, READ_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
13 }
14
15 avio = AVIO(ff, alloc_context, ff->readbuf, READ_SIZE, 0, NULL, _read_data, NULL, NULL);
+0
-49
debian/patches/ffmpeg_2.9.patch less more
0 Description: Replace deprecated FFmpeg API
1 Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2 Last-Update: <2015-11-02>
3
4 --- squeezelite-1.8.orig/ffmpeg.c
5 +++ squeezelite-1.8/ffmpeg.c
6 @@ -52,8 +52,8 @@ struct ff_s {
7 unsigned (* avcodec_version)(void);
8 AVCodec * (* avcodec_find_decoder)(int);
9 int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **);
10 - AVFrame * (* avcodec_alloc_frame)(void);
11 - void (* avcodec_free_frame)(AVFrame **);
12 + AVFrame * (* av_frame_alloc)(void);
13 + void (* av_frame_free)(AVFrame **);
14 int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *);
15 // ffmpeg symbols to be dynamically loaded from libavformat
16 unsigned (* avformat_version)(void);
17 @@ -324,7 +324,7 @@ static decode_state ff_decode(void) {
18
19 AVCODEC(ff, open2, ff->codecC, codec, NULL);
20
21 - ff->frame = AVCODEC(ff, alloc_frame);
22 + ff->frame = AV(ff, frame_alloc);
23
24 ff->avpkt = AV(ff, malloc, sizeof(AVPacket));
25 if (ff->avpkt == NULL) {
26 @@ -520,9 +520,9 @@ static void _free_ff_data(void) {
27 if (ff->frame) {
28 // ffmpeg version dependant free function
29 #if !LINKALL
30 - ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame);
31 + ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame);
32 #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0)
33 - AVCODEC(ff, free_frame, &ff->frame);
34 + AV(ff, frame_free, &ff->frame);
35 #else
36 AV(ff, freep, &ff->frame);
37 #endif
38 @@ -607,8 +607,8 @@ static bool load_ff() {
39 ff->avcodec_version = dlsym(handle_codec, "avcodec_version");
40 ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder");
41 ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2");
42 - ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame");
43 - ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame");
44 + ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc");
45 + ff->av_frame_free = dlsym(handle_codec, "av_frame_free");
46 ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4");
47 ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
48 ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
+0
-4
debian/patches/series less more
0 Makefile-tweaks.patch
1 Makefile-portaudio.patch
2 ffmpeg_2.9.patch
30 rename-logs.patch
4 ffmpeg4.0.patch