102 lines
6.3 KiB
Text
102 lines
6.3 KiB
Text
Index: configure.ac
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -84,6 +84,7 @@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-als
|
|
AC_ARG_ENABLE(oss, [AS_HELP_STRING([--disable-oss ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
|
|
AC_ARG_ENABLE(pulse, [AS_HELP_STRING([--disable-pulse ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
|
|
AC_ARG_ENABLE(coreaudio,[AS_HELP_STRING([--disable-coreaudio], [disable CoreAudio output plugin (default: enabled)])], [enable_coreaudio=$enableval], [enable_coreaudio=yes])
|
|
+AC_ARG_ENABLE(sndio, [AS_HELP_STRING([--disable-sndio ], [disable sndio output plugin (default: enabled)])], [enable_sndio=$enableval], [enable_sndio=yes])
|
|
AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--disable-gtk3 ], [disable GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
|
|
AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [disable GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
|
|
AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
|
|
@@ -193,8 +194,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_
|
|
dnl HACK: using undocumented variable to check whether it's safe to define __EXTENSIONS__
|
|
test $ac_cv_safe_to_define___extensions__ = yes && CFLAGS_EXTENSIONS="-D__EXTENSIONS__"
|
|
|
|
-CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
|
|
-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
|
|
+CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS"
|
|
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS"
|
|
|
|
|
|
AS_IF([test "${enable_staticlink}" != "no"], [
|
|
@@ -295,6 +296,17 @@ AS_IF([test "${enable_coreaudio}" != "no" -a "${found_
|
|
|
|
AC_SUBST(COREAUDIO_LIBS)
|
|
|
|
+AC_CHECK_HEADER([sndio.h], [found_sndio_h=yes], [found_sndio_h=no])
|
|
+AC_CHECK_LIB([sndio], [main], [found_sndio_lib=yes], [found_sndio_lib=no])
|
|
+AS_IF([test "${enable_sndio}" != "no" -a "${found_sndio_h}" != "no" -a "${found_sndio_lib}" != "no"], [
|
|
+ AC_DEFINE(HAVE_SNDIO, 1, [Build sndio support])
|
|
+ HAVE_SNDIO=yes
|
|
+ SNDIO_LIBS="-lsndio"
|
|
+])
|
|
+
|
|
+AC_SUBST(SNDIO_LIBS)
|
|
+
|
|
+
|
|
AS_IF([test "${enable_ffmpeg}" != "no"], [
|
|
AS_IF([test "${enable_staticlink}" != "no"], [
|
|
FFMPEG_DEPS_CFLAGS="-I../../$LIB/include"
|
|
@@ -402,11 +414,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [
|
|
AC_SUBST(VORBIS_LIBS)
|
|
AC_SUBST(VORBIS_CFLAGS)
|
|
], [
|
|
- AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes])
|
|
- AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
|
|
+ AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes], [], [-logg -lm])
|
|
+ AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes], [], [-lvorbis -logg -lm])
|
|
AS_IF([test "$HAVE_VORBIS" = "yes" -a "${HAVE_VORBISFILE}" = "yes"], [
|
|
HAVE_VORBISPLUGIN=yes
|
|
- VORBIS_LIBS="-lvorbis -lvorbisfile"
|
|
+ VORBIS_LIBS="-lvorbis -lvorbisfile -logg -lm"
|
|
AC_SUBST(VORBIS_LIBS)
|
|
])
|
|
])
|
|
@@ -455,10 +467,10 @@ AS_IF([test "${enable_flac}" != "no"], [
|
|
AC_SUBST(FLAC_CFLAGS)
|
|
AC_SUBST(FLAC_LIBS)
|
|
], [
|
|
- AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
|
|
+ AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes], [], [-logg -lm])
|
|
AS_IF([test "${HAVE_FLAC}" = "yes"], [
|
|
HAVE_FLACPLUGIN=yes
|
|
- FLAC_LIBS="-lFLAC"
|
|
+ FLAC_LIBS="-lFLAC -logg -lm"
|
|
AC_SUBST(FLAC_LIBS)
|
|
])
|
|
])
|
|
@@ -735,7 +747,7 @@ AS_IF([test "${enable_aac}" != "no"], [
|
|
])
|
|
|
|
AS_IF([test "${enable_mms}" != "no"], [
|
|
- LIBMMS_LIBS=""
|
|
+ LIBMMS_LIBS="-lmms"
|
|
AC_SUBST(LIBMMS_LIBS)
|
|
HAVE_MMS=yes
|
|
])
|
|
@@ -809,7 +821,7 @@ AS_IF([test "${enable_soundtouch}" != "no"], [
|
|
HAVE_SOUNDTOUCH=yes
|
|
])
|
|
|
|
-PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/psf plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner plugins/soundtouch"
|
|
+PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/psf plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner plugins/soundtouch plugins/sndio"
|
|
|
|
AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
|
|
AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
|
|
@@ -825,6 +837,7 @@ AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes")
|
|
AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
|
|
AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes")
|
|
AM_CONDITIONAL(HAVE_COREAUDIO, test "x$HAVE_COREAUDIO" = "xyes")
|
|
+AM_CONDITIONAL(HAVE_SNDIO, test "x$HAVE_SNDIO" = "xyes")
|
|
AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
|
|
AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
|
|
AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
|
|
@@ -933,6 +946,7 @@ plugins/wma/Makefile
|
|
plugins/pltbrowser/Makefile
|
|
plugins/sc68/Makefile
|
|
plugins/coreaudio/Makefile
|
|
+plugins/sndio/Makefile
|
|
plugins/rg_scanner/Makefile
|
|
plugins/soundtouch/Makefile
|
|
po/Makefile.in
|