77 lines
4.7 KiB
Plaintext
77 lines
4.7 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.2 2013/01/03 11:54:49 shadchin Exp $
|
|
--- configure.ac.orig Tue Oct 23 01:36:08 2012
|
|
+++ configure.ac Tue Oct 23 22:36:22 2012
|
|
@@ -111,6 +111,7 @@ AC_ARG_ENABLE(mono2stereo, [AS_HELP_STRING([--ena
|
|
AC_ARG_ENABLE(shellexecui, [AS_HELP_STRING([--enable-shellexecui ], [build shellexec GTK UI plugin (default: auto)])], [enable_shellexecui=$enableval], [enable_shellexecui=yes])
|
|
AC_ARG_ENABLE(alac, [AS_HELP_STRING([--enable-alac ], [build ALAC plugin (default: auto)])], [enable_alac=$enableval], [enable_alac=yes])
|
|
AC_ARG_ENABLE(abstract_socket, [AS_HELP_STRING([--enable-abstract-socket ], [use abstract socket (default: enabled)])], [enable_abstract_socket=$enableval], [enable_abstract_socket=yes])
|
|
+AC_ARG_ENABLE(sndio, [AS_HELP_STRING([--enable-sndio ], [enable sndio output plugin (default: enabled)])], [enable_sndio=$enableval], [enable_sndio=yes])
|
|
|
|
if test "x$enable_staticlink" != "xno" ; then
|
|
AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version])
|
|
@@ -278,11 +279,11 @@ if test "x$enable_staticlink" != "xno" ; then
|
|
VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
|
|
AC_SUBST(VORBIS_LIBS)
|
|
else
|
|
- 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])
|
|
if test "x$HAVE_VORBIS" = "xyes" && test "x$HAVE_VORBISFILE" = "xyes" ; then
|
|
HAVE_VORBISPLUGIN=yes
|
|
- VORBIS_LIBS="-lvorbis -lvorbisfile"
|
|
+ VORBIS_LIBS="-lvorbis -lvorbisfile -logg -lm"
|
|
AC_SUBST(VORBIS_LIBS)
|
|
fi
|
|
fi
|
|
@@ -295,10 +296,10 @@ if test "x$enable_staticlink" != "xno" ; then
|
|
FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
|
|
AC_SUBST(FLAC_LIBS)
|
|
else
|
|
- AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
|
|
+ AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes], [], [-logg -lm])
|
|
if test "x$HAVE_FLAC" = "xyes" ; then
|
|
HAVE_FLACPLUGIN=yes
|
|
- FLAC_LIBS="-lFLAC"
|
|
+ FLAC_LIBS="-lFLAC -logg -lm"
|
|
AC_SUBST(FLAC_LIBS)
|
|
fi
|
|
fi
|
|
@@ -603,8 +604,11 @@ if test "x$enable_alac" != "xno" ; then
|
|
HAVE_ALAC=yes
|
|
fi
|
|
|
|
+if test "x$enable_sndio" != "xno" ; then
|
|
+ HAVE_SNDIO=yes
|
|
+fi
|
|
|
|
-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis 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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac"
|
|
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis 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/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/sndio"
|
|
|
|
AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
|
|
AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
|
|
@@ -657,6 +661,7 @@ AM_CONDITIONAL(STATICLINK, test "x$STATICLINK" = "xyes
|
|
AM_CONDITIONAL(PORTABLE, test "x$PORTABLE" = "xyes")
|
|
AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes")
|
|
AM_CONDITIONAL(USE_ABSTRACT_SOCKET_NAME, test "x$USE_ABSTRACT_SOCKET_NAME" = "xyes")
|
|
+AM_CONDITIONAL(HAVE_SNDIO, test "x$HAVE_SNDIO" = "xyes")
|
|
|
|
AC_SUBST(PLUGINS_DIRS)
|
|
|
|
@@ -724,6 +729,7 @@ PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn]
|
|
PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
|
|
PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for configuring shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
|
|
PRINT_PLUGIN_INFO([alac],[ALAC plugin],[test "x$HAVE_ALAC" = "xyes"])
|
|
+PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"])
|
|
|
|
echo
|
|
|
|
@@ -771,6 +777,7 @@ plugins/shn/Makefile
|
|
plugins/mono2stereo/Makefile
|
|
plugins/shellexecui/Makefile
|
|
plugins/alac/Makefile
|
|
+plugins/sndio/Makefile
|
|
intl/Makefile
|
|
po/Makefile.in
|
|
deadbeef.desktop
|