Merge pull request #4853 from StevenHessing/noddos
[feed/packages.git] / sound / squeezelite / patches / 020-no_libmad.patch
1 --- a/Makefile
2 +++ b/Makefile
3 @@ -15,7 +15,7 @@ OPT_IR = -DIR
4 SOURCES = \
5 main.c slimproto.c buffer.c stream.c utils.c \
6 output.c output_alsa.c output_pa.c output_stdout.c output_pack.c decode.c \
7 - flac.c pcm.c mad.c vorbis.c faad.c mpg.c
8 + flac.c pcm.c vorbis.c faad.c mpg.c
9
10 SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c
11 SOURCES_FF = ffmpeg.c
12 @@ -25,7 +25,7 @@ SOURCES_IR = ir.c
13
14 LINK_LINUX = -ldl
15
16 -LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123
17 +LINKALL = -lFLAC -lvorbisfile -lfaad -lmpg123
18 LINKALL_FF = -lavcodec -lavformat -lavutil
19 LINKALL_RESAMPLE = -lsoxr
20 LINKALL_IR = -llirc_client
21 --- a/decode.c
22 +++ b/decode.c
23 @@ -145,8 +145,8 @@ void decode_init(log_level level, const
24 if (!strstr(exclude_codecs, "pcm") && (!include_codecs || strstr(include_codecs, "pcm"))) codecs[i++] = register_pcm();
25
26 // try mad then mpg for mp3 unless command line option passed
27 - if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
28 - (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad();
29 +// if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
30 +// (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad();
31 if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] &&
32 (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg();
33
34 --- a/main.c
35 +++ b/main.c
36 @@ -39,7 +39,8 @@
37 #else
38 #define CODECS_DSD ""
39 #endif
40 -#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
41 +//#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
42 +#define CODECS_MP3 " (mpg123 for specific mp3 codec)"
43
44 #define CODECS CODECS_BASE CODECS_FF CODECS_DSD CODECS_MP3
45
46 --- a/squeezelite.h
47 +++ b/squeezelite.h
48 @@ -154,7 +154,7 @@
49
50 #if LINUX
51 #define LIBFLAC "libFLAC.so.8"
52 -#define LIBMAD "libmad.so.0"
53 +//#define LIBMAD "libmad.so.0"
54 #define LIBMPG "libmpg123.so.0"
55 #define LIBVORBIS "libvorbisfile.so.3"
56 #define LIBTREMOR "libvorbisidec.so.1"
57 @@ -168,7 +168,7 @@
58
59 #if OSX
60 #define LIBFLAC "libFLAC.8.dylib"
61 -#define LIBMAD "libmad.0.dylib"
62 +//#define LIBMAD "libmad.0.dylib"
63 #define LIBMPG "libmpg123.0.dylib"
64 #define LIBVORBIS "libvorbisfile.3.dylib"
65 #define LIBTREMOR "libvorbisidec.1.dylib"
66 @@ -181,7 +181,7 @@
67
68 #if WIN
69 #define LIBFLAC "libFLAC.dll"
70 -#define LIBMAD "libmad-0.dll"
71 +//#define LIBMAD "libmad-0.dll"
72 #define LIBMPG "libmpg123-0.dll"
73 #define LIBVORBIS "libvorbisfile.dll"
74 #define LIBTREMOR "libvorbisidec.dll"
75 @@ -194,7 +194,7 @@
76
77 #if FREEBSD
78 #define LIBFLAC "libFLAC.so.11"
79 -#define LIBMAD "libmad.so.2"
80 +//#define LIBMAD "libmad.so.2"
81 #define LIBMPG "libmpg123.so.0"
82 #define LIBVORBIS "libvorbisfile.so.6"
83 #define LIBTREMOR "libvorbisidec.so.1"