020-no_mpg123.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283
  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 mad.c vorbis.c faad.c
  9. SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c
  10. SOURCES_FF = ffmpeg.c
  11. @@ -25,7 +25,7 @@ SOURCES_IR = ir.c
  12. LINK_LINUX = -ldl
  13. -LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123
  14. +LINKALL = -lFLAC -lmad -lvorbisfile -lfaad
  15. LINKALL_FF = -lavcodec -lavformat -lavutil
  16. LINKALL_RESAMPLE = -lsoxr
  17. LINKALL_IR = -llirc_client
  18. --- a/decode.c
  19. +++ b/decode.c
  20. @@ -147,8 +147,8 @@ void decode_init(log_level level, const
  21. // try mad then mpg for mp3 unless command line option passed
  22. if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
  23. (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad"))) codecs[i] = register_mad();
  24. - if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] &&
  25. - (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg();
  26. +// if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] &&
  27. +// (!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg"))) codecs[i] = register_mpg();
  28. mutex_create(decode.mutex);
  29. --- a/main.c
  30. +++ b/main.c
  31. @@ -39,7 +39,8 @@
  32. #else
  33. #define CODECS_DSD ""
  34. #endif
  35. -#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
  36. +//#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
  37. +#define CODECS_MP3 " (mad for specific mp3 codec)"
  38. #define CODECS CODECS_BASE CODECS_FF CODECS_DSD CODECS_MP3
  39. --- a/squeezelite.h
  40. +++ b/squeezelite.h
  41. @@ -155,7 +155,7 @@
  42. #if LINUX
  43. #define LIBFLAC "libFLAC.so.8"
  44. #define LIBMAD "libmad.so.0"
  45. -#define LIBMPG "libmpg123.so.0"
  46. +//#define LIBMPG "libmpg123.so.0"
  47. #define LIBVORBIS "libvorbisfile.so.3"
  48. #define LIBTREMOR "libvorbisidec.so.1"
  49. #define LIBFAAD "libfaad.so.2"
  50. @@ -169,7 +169,7 @@
  51. #if OSX
  52. #define LIBFLAC "libFLAC.8.dylib"
  53. #define LIBMAD "libmad.0.dylib"
  54. -#define LIBMPG "libmpg123.0.dylib"
  55. +//#define LIBMPG "libmpg123.0.dylib"
  56. #define LIBVORBIS "libvorbisfile.3.dylib"
  57. #define LIBTREMOR "libvorbisidec.1.dylib"
  58. #define LIBFAAD "libfaad.2.dylib"
  59. @@ -182,7 +182,7 @@
  60. #if WIN
  61. #define LIBFLAC "libFLAC.dll"
  62. #define LIBMAD "libmad-0.dll"
  63. -#define LIBMPG "libmpg123-0.dll"
  64. +//#define LIBMPG "libmpg123-0.dll"
  65. #define LIBVORBIS "libvorbisfile.dll"
  66. #define LIBTREMOR "libvorbisidec.dll"
  67. #define LIBFAAD "libfaad2.dll"
  68. @@ -195,7 +195,7 @@
  69. #if FREEBSD
  70. #define LIBFLAC "libFLAC.so.11"
  71. #define LIBMAD "libmad.so.2"
  72. -#define LIBMPG "libmpg123.so.0"
  73. +//#define LIBMPG "libmpg123.so.0"
  74. #define LIBVORBIS "libvorbisfile.so.6"
  75. #define LIBTREMOR "libvorbisidec.so.1"
  76. #define LIBFAAD "libfaad.so.2"