Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
aee25941
Commit
aee25941
authored
17 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
Delete last reminescence of portaudio
Website update + clean build system
parent
ab7002ac
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
README
+0
-7
0 additions, 7 deletions
README
configure.ac
+0
-13
0 additions, 13 deletions
configure.ac
doc/Build.txt
+0
-13
0 additions, 13 deletions
doc/Build.txt
doc/Dependencies.txt
+1
-3
1 addition, 3 deletions
doc/Dependencies.txt
src/Makefile.am
+3
-1
3 additions, 1 deletion
src/Makefile.am
with
4 additions
and
37 deletions
README
+
0
−
7
View file @
aee25941
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
0
−
13
View file @
aee25941
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
doc/Build.txt
+
0
−
13
View file @
aee25941
...
...
@@ -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
~~~~~~~~~~
...
...
This diff is collapsed.
Click to expand it.
doc/Dependencies.txt
+
1
−
3
View file @
aee25941
...
...
@@ -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
--------------------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
3
−
1
View file @
aee25941
...
...
@@ -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
)
"
\"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment