diff --git a/README b/README index ea7f29fd578a613e3f3fc103702a7979164ad5da..ea8a46f542874f9b58562594d54fa3048fb2a6ff 100644 --- a/README +++ b/README @@ -54,13 +54,6 @@ Required libraries and tools: http://savannah.gnu.org/projects/osip/ - libxml2, libxml2-devel, pkgconfig usually available in distribution repositories -- portaudio v19, - available on http://www.portaudio.com/ - http://portaudio.com/archives/pa_snapshot_v19.tar.gz - or - svn co https://www.portaudio.com/repos/portaudio/branches/v19-devel portaudio - or - cd tools/ ./portaudio.sh - autoconf Optional libraries: diff --git a/configure.ac b/configure.ac index d8c0d430ac307de8679a34cc8cfc35ba2065c668..156bf4252823a4c293c7f0a74dd2870ca193683c 100644 --- a/configure.ac +++ b/configure.ac @@ -136,9 +136,6 @@ AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \ inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \ strchr strdup strerror strrchr strstr strtol utime]) -dnl Check for portaudio -dnl PORTAUDIO_SETUP - dnl Check for exosip2 LP_CHECK_EXOSIP2 SFLPHONE_LIBS="$SFLPHONE_LIBS $EXOSIP_LIBS" @@ -185,16 +182,6 @@ PKG_CHECK_MODULES(libccrtp1, libccrtp1 >= ${LIBCCRT_MIN_VERSION}) SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libccrtp1_CFLAGS" SFLPHONE_LIBS="$SFLPHONE_LIBS $libccrtp1_LIBS" -LIBPORTAUDIO_MIN_VERSION=19 -PKG_CHECK_MODULES(libportaudio, portaudio-2.0 >= ${LIBPORTAUDIO_MIN_VERSION}) -SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libportaudio_CFLAGS" -SFLPHONE_LIBS="$SFLPHONE_LIBS $libportaudio_LIBS" - -LIBPORTAUDIOCPP_MIN_VERSION=12 -PKG_CHECK_MODULES(libportaudiocpp, portaudiocpp >= ${LIBPORTAUDIOCPP_MIN_VERSION}) -SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libportaudiocpp_CFLAGS" -SFLPHONE_LIBS="$SFLPHONE_LIBS $libportaudiocpp_LIBS" - LIBDBUSCPP_MIN_VERSION=0.5 PKG_CHECK_MODULES(libdbuscpp, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION}) SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libdbuscpp_CFLAGS" diff --git a/doc/Build.txt b/doc/Build.txt index ee851464eca42c325cf368835883ba7830bb1237..71a6d5dc7c4650bd43f1431b411e798275bfb9af 100644 --- a/doc/Build.txt +++ b/doc/Build.txt @@ -45,19 +45,6 @@ sudo make install -portaudio -~~~~~~~~~ - -Go to `tools/` and run: - ----------------------------- -./portaudio.sh --prefix=/usr -cd portaudio -sudo make install ----------------------------- - -NOTE: If you have `colorgcc`, building might *fail*. Use `unset CC` and `unset CXX` to disable it before building `portaudio`. - the daemon ~~~~~~~~~~ diff --git a/doc/Dependencies.txt b/doc/Dependencies.txt index 552212061f26f78356efaae28a346fd6508f8e13..bc248a515f2b897b71316838f74521239554b7da 100644 --- a/doc/Dependencies.txt +++ b/doc/Dependencies.txt @@ -12,8 +12,6 @@ Common C++2 1.3.21 http://sourceforge.net/projects/cplusplus/[websi ccRTP 1.3.5 http://sourceforge.net/projects/cplusplus/[website] libeXosip2 ** 2.2.2 http://savannah.nongnu.org/projects/exosip/[website] libosip2 2.2.2 http://www.gnu.org/software/osip/[website] -portaudio v19 http://www.portaudio.com/[website] -portaudio C++ binds. http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz[archive] libsamplerate 0.1.2 http://www.mega-nerd.com/SRC/[website] libdbus-glib 0.73 Packaged with your favorite distribution. dbus-c++-1 0.5 Source code included in the git repository. See Build notes. @@ -31,7 +29,7 @@ Dependencies to compile SFLphone-GTK Program Version Notes -------------------------------------------------------------------------------------- libgtk2.0 2.2 -gtkglext 1.0 +gtkglext 1.0 Video branch. Integration OpenGL and GTK dbus-glib 0.35 gnome-common -------------------------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 9edb0e643d12d4be9e1be60a452ed4ea1c6454f9..e10bcba5bb35011693a591fba8c97e9ae9b7a118 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,8 @@ IAXSOURCES = IAXHEADERS = endif +ALSAFLAG= -lasound + SUBDIRS = audio config dbus memmanager video mixer $(ZEROCONFDIR) sflphoned_SOURCES = eventthread.cpp main.cpp voiplink.cpp \ @@ -39,7 +41,7 @@ sflphoned_SOURCES = eventthread.cpp main.cpp voiplink.cpp \ sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS) $(IAX_FLAGS) $(SFLPHONE_CFLAGS) $(SIP_CFLAGS) #sflphoned_LDFLAGS = -static -sflphoned_LDADD = ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS) +sflphoned_LDADD = ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS) $(ALSAFLAG) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(IAX_CFLAGS) $(USER_INCLUDES) $(libdbuscpp_CFLAGS) \ -DCODECS_DIR=\""$(sflcodecdir)"\"