diff --git a/configure.ac b/configure.ac index 06f7aba6..b43e5489 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,12 @@ PKG_CHECK_MODULES(MPG123, [libmpg123], have_libmpg123=yes, ) AM_CONDITIONAL(HAVE_LIBMPG123, test "$have_libmpg123" = yes) +have_libspeex=no +PKG_CHECK_MODULES(SPEEX, [speex], have_libspeex=yes, + [AC_MSG_WARN([Cannot find libspeex - will not enable Speex formats])] +) +AM_CONDITIONAL(HAVE_LIBSPEEX, test "$have_libspeex" = yes) + have_ffmpeg=no #PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil libswresample], have_ffmpeg=yes, # [AC_MSG_WARN([Cannot find ffmpeg - will not enable FFmpeg formats])] diff --git a/doc/BUILD.md b/doc/BUILD.md index 5c6b1513..d8fb35a4 100644 --- a/doc/BUILD.md +++ b/doc/BUILD.md @@ -153,11 +153,11 @@ msbuild fb2k/foo_input_vgmstream.vcxproj ^ ``` ### Audacious plugin -Requires the dev version of Audacious (and dependencies), automake/autoconf or cmake, and gcc/make (C++11). It must be compiled and installed into Audacious, where it should appear in the plugin list as "vgmstream". +Requires the dev version of Audacious (and dependencies), automake/autoconf or CMake, and gcc/make (C++11). It must be compiled and installed into Audacious, where it should appear in the plugin list as "vgmstream". The plugin needs Audacious 3.5 or higher. New Audacious releases can break plugin compatibility so it may not work with the latest version unless adapted first. -libvorbis and libmpg123 will be used if found, while FFmpeg and other external libraries aren't enabled at the moment, thus some formats won't work (build scripts need to be fixed). +libvorbis/libmpg123/libspeex will be used if found, while FFmpeg and other external libraries aren't enabled at the moment, thus some formats won't work (build scripts need to be fixed). Windows builds aren't supported at the moment (should be possible but there are complex dependency chains). @@ -176,7 +176,7 @@ sudo apt-get install gcc g++ make sudo apt-get install autoconf automake libtool sudo apt-get install git # vgmstream dependencies -sudo apt-get install libmpg123-dev libvorbis-dev +sudo apt-get install libmpg123-dev libvorbis-dev libspeex-dev #sudo apt-get install libavformat-dev libavcodec-dev libavutil-dev libswresample-dev # Audacious player and dependencies sudo apt-get install audacious @@ -227,7 +227,7 @@ To update vgmstream it's probably easiest to remove the `vgmstream` folder and s Instead of autotools you can try building with CMake. Some older distros may not work though (CMake version needs to recognize FILTER command). You may need to install resulting artifacts manually. ``` sudo apt-get update -sudo apt-get install -y libmpg123-dev libvorbis-dev +sudo apt-get install -y libmpg123-dev libvorbis-dev libspeex-dev sudo apt-get install -y libavformat-dev libavcodec-dev libavutil-dev libswresample-dev sudo apt-get install -y libao-dev audacious-dev sudo apt-get install -y cmake diff --git a/src/Makefile.autotools.am b/src/Makefile.autotools.am index 8bf49834..9cb9d459 100644 --- a/src/Makefile.autotools.am +++ b/src/Makefile.autotools.am @@ -29,6 +29,11 @@ AM_CFLAGS += -DVGM_USE_MPEG libvgmstream_la_LIBADD += $(MPG123_LIBS) endif +if HAVE_LIBSPEEX +AM_CFLAGS += -DVGM_USE_SPEEX +libvgmstream_la_LIBADD += $(SPEEX_LIBS) +endif + if HAVE_FFMPEG AM_CFLAGS += -DVGM_USE_FFMPEG libvgmstream_la_LIBADD += $(FFMPEG_LIBS) diff --git a/src/coding/Makefile.autotools.am b/src/coding/Makefile.autotools.am index 8ea74394..67fa13c6 100644 --- a/src/coding/Makefile.autotools.am +++ b/src/coding/Makefile.autotools.am @@ -22,6 +22,10 @@ if HAVE_LIBMPG123 AM_CFLAGS += -DVGM_USE_MPEG endif +if HAVE_LIBSPEEX +AM_CFLAGS += -DVGM_USE_SPEEX +endif + if HAVE_FFMPEG AM_CFLAGS += -DVGM_USE_FFMPEG endif diff --git a/src/layout/Makefile.autotools.am b/src/layout/Makefile.autotools.am index 1199040d..0f2d0102 100644 --- a/src/layout/Makefile.autotools.am +++ b/src/layout/Makefile.autotools.am @@ -22,6 +22,10 @@ if HAVE_LIBMPG123 AM_CFLAGS += -DVGM_USE_MPEG endif +if HAVE_LIBSPEEX +AM_CFLAGS += -DVGM_USE_SPEEX +endif + if HAVE_FFMPEG AM_CFLAGS += -DVGM_USE_FFMPEG endif diff --git a/src/meta/Makefile.autotools.am b/src/meta/Makefile.autotools.am index 407ea731..480b15c4 100644 --- a/src/meta/Makefile.autotools.am +++ b/src/meta/Makefile.autotools.am @@ -22,6 +22,10 @@ if HAVE_LIBMPG123 AM_CFLAGS += -DVGM_USE_MPEG endif +if HAVE_LIBSPEEX +AM_CFLAGS += -DVGM_USE_SPEEX +endif + if HAVE_FFMPEG AM_CFLAGS += -DVGM_USE_FFMPEG endif