Skip to content
Snippets Groups Projects
Commit e7a23822 authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

Merge branch 'master' into qt-client

parents 329879d0 c48b51bb
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 2521 additions and 26 deletions
.gitignore
+ 45
− 0
View file @ e7a23822
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*.Plo *.Plo
*.loT *.loT
*.m4 *.m4
*.Tpo
Makefile.in Makefile.in
*.spec *.spec
/config.* /config.*
...@@ -82,6 +83,7 @@ libs/utilspp/functor/Makefile ...@@ -82,6 +83,7 @@ libs/utilspp/functor/Makefile
libs/utilspp/singleton/Makefile libs/utilspp/singleton/Makefile
sflphone-gtk/Makefile sflphone-gtk/Makefile
sflphone-gtk/src/Makefile sflphone-gtk/src/Makefile
sflphone-gtk/src/contactlist/Makefile
sflphone-gtk/pixmaps/Makefile sflphone-gtk/pixmaps/Makefile
...@@ -107,7 +109,50 @@ sflphone-gtk/pixmaps/Makefile ...@@ -107,7 +109,50 @@ sflphone-gtk/pixmaps/Makefile
/libs/libiax2/ltmain.sh /libs/libiax2/ltmain.sh
/libs/libiax2/iax-config /libs/libiax2/iax-config
/libs/libiax2/configure /libs/libiax2/configure
/libs/libiax2/Makefile
/libs/libiax2/iax2-config
/libs/libiax2/src/Makefile
## dbus-c++
libs/dbus-c++/Makefile
libs/dbus-c++/autom4te.cache/requests
libs/dbus-c++/config.log
libs/dbus-c++/Makefile
libs/dbus-c++/autom4te.cache/requests
libs/dbus-c++/config.log
libs/dbus-c++/config.status
libs/dbus-c++/configure
libs/dbus-c++/data/Makefile
libs/dbus-c++/dbus-c++-1-uninstalled.pc
libs/dbus-c++/dbus-c++-1.pc
libs/dbus-c++/doc/Doxyfile
libs/dbus-c++/doc/Makefile
libs/dbus-c++/examples/Makefile
libs/dbus-c++/examples/echo/.libs/
libs/dbus-c++/examples/echo/Makefile
libs/dbus-c++/examples/echo/echo-client-glue.h
libs/dbus-c++/examples/echo/echo-client-mt
libs/dbus-c++/examples/echo/echo-server
libs/dbus-c++/examples/echo/echo-server-glue.h
libs/dbus-c++/examples/glib/Makefile
libs/dbus-c++/examples/glib/dbus-glue.h
libs/dbus-c++/examples/hal/.libs/
libs/dbus-c++/examples/hal/Makefile
libs/dbus-c++/examples/hal/hal-listen
libs/dbus-c++/examples/properties/.libs/
libs/dbus-c++/examples/properties/Makefile
libs/dbus-c++/examples/properties/propsgs-client
libs/dbus-c++/examples/properties/propsgs-glue-adaptor.h
libs/dbus-c++/examples/properties/propsgs-glue-proxy.h
libs/dbus-c++/examples/properties/propsgs-server
libs/dbus-c++/include/dbus-c++/config.h
libs/dbus-c++/include/dbus-c++/stamp-h1
libs/dbus-c++/src/.libs/
libs/dbus-c++/src/Makefile
libs/dbus-c++/tools/.libs/
libs/dbus-c++/tools/Makefile
libs/dbus-c++/tools/dbusxx-introspect
libs/dbus-c++/tools/dbusxx-xml2cpp
# Ignore temp files # Ignore temp files
*~ *~
......
autogen.sh
+ 1
− 1
View file @ e7a23822
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
aclocal -I m4 aclocal -I m4
libtoolize --force libtoolize --force
autoheader autoheader
autoconf -v -f autoconf -f
automake -a automake -a
./configure $@ ./configure $@
configure.ac
+ 26
− 12
View file @ e7a23822
...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59 ...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([SFLPhone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone]) AC_INIT([SFLphone],[0.9.3],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]]) AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$]) AC_REVISION([$Revision$])
...@@ -53,30 +53,29 @@ AC_CONFIG_FILES([man/Makefile]) ...@@ -53,30 +53,29 @@ AC_CONFIG_FILES([man/Makefile])
AC_CONFIG_FILES([doc/Makefile \ AC_CONFIG_FILES([doc/Makefile \
doc/doxygen/Makefile]) doc/doxygen/Makefile])
AC_CONFIG_FILES([platform/rpm/sflphone.spec \ AC_CONFIG_FILES([platform/suse.spec \
platform/fedora/sflphone.spec \ platform/fedora.spec])
platform/fedora/sflphone-fc6.spec])
dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h)) dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
dnl AM_CONFIG_HEADER(config.h) dnl AM_CONFIG_HEADER(config.h)
dnl Get project version dnl Get project version
VERSION=`sed -ne 's/^#define SFLPHONED_VERSION "\(.*\)"/\1/p' ${srcdir}/src/global.h` VERSION=`sed -ne 's/^#define SFLPHONED_VERSION "\(.*\)"/\1/p' src/global.h`
dnl Get rid of release number dnl Get rid of release number
RPM_VERSION=`echo $VERSION | cut -d- -f1` RPM_VERSION=`echo $VERSION | cut -d- -f1`
AC_SUBST(RPM_VERSION) AC_SUBST(RPM_VERSION)
RPM_RELEASE=`echo $VERSION | sed -ne 's/.*-\(.*\)/\1/p' ` RPM_RELEASE=`echo $VERSION | sed -ne 's/.*-\(.*\)/\1/p' `
AC_SUBST(RPM_RELEASE) AC_SUBST(RPM_RELEASE)
VERSION=`echo $VERSION | cut -d- -f1` VERSION=`echo $VERSION | cut -f1 -d\' \'`
AC_SUBST(VERSION) AC_SUBST(VERSION)
dnl Settings need Standard C++ Library dnl Settings need Standard C++ Library
LIBS="$LIBS -lstdc++" LIBS="$LIBS -lstdc++"
dnl Solaris pkgadd support definitions dnl Solaris pkgadd support definitions
PKGADD_PKG="SFLPhone" PKGADD_PKG="SFLphone"
PKGADD_NAME="SFLPhone - a SIP client and daemon" PKGADD_NAME="SFLphone - a SIP client and daemon"
PKGADD_VENDOR="http://www.sflphone.org/" PKGADD_VENDOR="http://www.sflphone.org/"
AC_SUBST(PKGADD_PKG) AC_SUBST(PKGADD_PKG)
AC_SUBST(PKGADD_NAME) AC_SUBST(PKGADD_NAME)
...@@ -189,11 +188,18 @@ PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION}) ...@@ -189,11 +188,18 @@ PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION})
AC_SUBST(DBUSCPP_LIBS) AC_SUBST(DBUSCPP_LIBS)
AC_SUBST(DBUSCPP_CFLAGS) AC_SUBST(DBUSCPP_CFLAGS)
LIBOPENSSL_MIN_VERSION=0.9.8
PKG_CHECK_MODULES(LIBOPENSSL, libssl >= ${LIBOPENSSL_MIN_VERSION})
AC_SUBST(LIBOPENSSL_LIBS)
AC_SUBST(LIBOPENSSL_CFLAGS)
dnl Check for libcppunit-dev dnl Check for libcppunit-dev
CPPUNIT_MIN_VERSION=1.12 CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}) PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_LIBS)
LIBSSL_MIN_VERSION=0.9.8
# check for libgsm1 (doesn't use pkg-config) # check for libgsm1 (doesn't use pkg-config)
dnl Check for libgsm dnl Check for libgsm
AC_ARG_WITH([gsm], AC_ARG_WITH([gsm],
...@@ -223,7 +229,6 @@ AC_ARG_WITH([speex], ...@@ -223,7 +229,6 @@ AC_ARG_WITH([speex],
[], [],
[with_speex=yes]) [with_speex=yes])
LIBSPEEX=
AS_IF([test "x$with_speex" != xno], AS_IF([test "x$with_speex" != xno],
[AC_CHECK_HEADER([speex/speex.h], , AC_MSG_FAILURE([Unable to find the libspeex headers (you may need to install the dev package). You may use --without-speex to compile without speex codec support.]))] [AC_CHECK_HEADER([speex/speex.h], , AC_MSG_FAILURE([Unable to find the libspeex headers (you may need to install the dev package). You may use --without-speex to compile without speex codec support.]))]
[AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the libspeexdsp headers (you may need to install the libspeexdsp-dev package). You may use --without-speex to compile without speex codec support.]))] [AC_CHECK_HEADER([speex/speex_preprocess.h], , AC_MSG_FAILURE([Unable to find the libspeexdsp headers (you may need to install the libspeexdsp-dev package). You may use --without-speex to compile without speex codec support.]))]
...@@ -233,10 +238,19 @@ AS_IF([test "x$with_speex" != xno], ...@@ -233,10 +238,19 @@ AS_IF([test "x$with_speex" != xno],
[libspeex link test failed. You may use --without-speex to compile without speex codec support.])] [libspeex link test failed. You may use --without-speex to compile without speex codec support.])]
) )
] ]
dnl More advanced check in case the libspeexdsp is not installed
AC_SEARCH_LIBS(speex_preprocess_run, speexdsp, HAVE_SPEEXDSP="yes", HAVE_SPEEXDSP="no", [])
if test $HAVE_SPEEXDSP="no"; then
echo $HAVE_SPEEXDSP;
AC_MSG_WARN([The silence detection in speex could not have been enabled])
fi
) )
AC_DEFINE([HAVE_SPEEX], test "x$with_speex" = "xyes", [Define if you have libspeex]) AC_DEFINE([HAVE_SPEEX], test "x$with_speex" = "xyes", [Define if you have libspeex])
AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" ) AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
AM_CONDITIONAL(ENABLE_SPEEXDSP, test $HAVE_SPEEXDSP = yes)
dnl Check for ilbc support dnl Check for ilbc support
AC_ARG_WITH([ilbc], AC_ARG_WITH([ilbc],
......
debian/changelog
+ 26
− 0
View file @ e7a23822
sflphone (0.9.3-0ubuntu3) %system%; urgency=low
[ Alexandre Savard ]
* Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
* Use PLUGHW device for ALSA capture
* Functional IAX and SIP recording for voicemail
* Use the less CPU-consuming interpolator algorithm for resampling
* Display in GTK GUI the codec used in conversation
* GTK GUI use ASCII instread of utf-8
* Add record menus in GTK GUI
* Put on hold when dialing a new number
* AccountID's are saved in the history
[ Emmanuel Milou ]
* Integrate DBUS C++, libiax2 in the git repository
* Update website
* Use libspeexdsp only if available on the system
* Updated .gitignore file
[Cyrille Béraud]
* Account assistant manager improvment
* Add an email request when creating a new account to receive voicemails
-- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Sat, 14 Feb 2009 13:29:15 -0500
sflphone (0.9.3-0ubuntu2) %system%; urgency=low sflphone (0.9.3-0ubuntu2) %system%; urgency=low
[ Emmanuel Milou ] [ Emmanuel Milou ]
...@@ -31,6 +56,7 @@ sflphone (0.9.3-0ubuntu2) %system%; urgency=low ...@@ -31,6 +56,7 @@ sflphone (0.9.3-0ubuntu2) %system%; urgency=low
* Remove previous version of PJSIP from the repo * Remove previous version of PJSIP from the repo
* Upgrade PJSIP to version 1.0.1 * Upgrade PJSIP to version 1.0.1
* Add the new website source in the repository * Add the new website source in the repository
* Use libspeexdsp for silence detection only if available
[ Loïc Faure-Lacroix ] [ Loïc Faure-Lacroix ]
* Ajout du logo gpl3 * Ajout du logo gpl3
......
debian/control.hardy
+ 2
− 2
View file @ e7a23822
...@@ -2,13 +2,13 @@ Source: sflphone ...@@ -2,13 +2,13 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev
Standards-Version: 3.7.3 Standards-Version: 3.7.3
Package: sflphone Package: sflphone
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>=2.22.2), libspeexdsp1 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 ,libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>=2.22.2)
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone Description: SIP and IAX2 compatible softphone
SFLphone is meant to be a robust enterprise-class desktop phone. SFLphone is meant to be a robust enterprise-class desktop phone.
......
debian/control.intrepid
+ 2
− 2
View file @ e7a23822
...@@ -2,13 +2,13 @@ Source: sflphone ...@@ -2,13 +2,13 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev Build-Depends: debhelper (>= 5), autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
Standards-Version: 3.8.0 Standards-Version: 3.8.0
Package: sflphone Package: sflphone
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>= 2.22.2), libspeexdsp1 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>= 2.22.2), libspeexdsp1
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone Description: SIP and IAX2 compatible softphone
SFLphone is meant to be a robust enterprise-class desktop phone. SFLphone is meant to be a robust enterprise-class desktop phone.
......
debian/control.jaunty
+ 2
− 2
View file @ e7a23822
...@@ -2,13 +2,13 @@ Source: sflphone ...@@ -2,13 +2,13 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com> Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome Section: gnome
Priority: optional Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
Standards-Version: 3.7.3 Standards-Version: 3.7.3
Package: sflphone Package: sflphone
Priority: optional Priority: optional
Architecture: any Architecture: any
Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>=2.22.2), libspeexdsp1 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) , libcommoncpp2-1.6-0 , libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8), librsvg2-common (>=2.22.2), libspeexdsp1
Homepage: http://www.sflphone.org Homepage: http://www.sflphone.org
Description: SIP and IAX2 compatible softphone Description: SIP and IAX2 compatible softphone
SFLphone is meant to be a robust enterprise-class desktop phone. SFLphone is meant to be a robust enterprise-class desktop phone.
......
debian/copyright
+ 4
− 4
View file @ e7a23822
This package was debianized by Yun Liu <yun.liu@savoirfairelinux.com> on This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
Wed, 26 Nov 2008 09:47:53 -0500. Wed, 26 Nov 2008 09:47:53 -0500.
It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
Upstream Author: Yun Liu <yun.liu@savoirfairelinux.com> Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright: Copyright:
SavoirFaire Linux Inc. Savoir-Faire Linux Inc.
License: License:
This software is copyright (c) 2004-2008 Savoir-Faire Linux inc. This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
You are free to distribute this software under the terms of You are free to distribute this software under the terms of
the GNU General Public License version 3. the GNU General Public License version 3.
......
debian/rules
+ 9
− 3
View file @ e7a23822
...@@ -22,8 +22,10 @@ configure-stamp: ...@@ -22,8 +22,10 @@ configure-stamp:
# Add here commands to configure the package. # Add here commands to configure the package.
./autogen.sh --prefix=/usr --with-debug ./autogen.sh --prefix=/usr --with-debug
cd sflphone-gtk; ./autogen.sh --prefix=/usr cd sflphone-gtk; ./autogen.sh --prefix=/usr
cd libs/pjproject-1.0; ./configure cd libs/pjproject-1.0.1; ./configure
touch configure-stamp touch configure-stamp
cd libs/dbus-c++; ./configure
cd libs/libiax2; ./configure
#Architecture #Architecture
...@@ -35,8 +37,10 @@ build-arch-stamp: configure-stamp ...@@ -35,8 +37,10 @@ build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package. # Add here commands to compile the arch part of the package.
$(MAKE) $(MAKE)
cd sflphone-gtk; make cd sflphone-gtk; make
cd libs/pjproject-1.0; $(MAKE) dep; $(MAKE) cd libs/pjproject-1.0.1; $(MAKE) dep; $(MAKE)
touch $@ touch $@
cd libs/dbus-c++; $(MAKE)
cd libs/libiax2; $(MAKE)
build-indep: build-indep-stamp build-indep: build-indep-stamp
build-indep-stamp: configure-stamp build-indep-stamp: configure-stamp
...@@ -76,7 +80,9 @@ install-arch: ...@@ -76,7 +80,9 @@ install-arch:
# debian/tmp. # debian/tmp.
$(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
cd sflphone-gtk; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install cd sflphone-gtk; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
cd libs/pjproject-1.0; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install cd libs/pjproject-1.0.1; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
cd libs/dbus-c++; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
cd libs/libiax2; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
rm -rf $(CURDIR)/debian/$(package)/usr/include rm -rf $(CURDIR)/debian/$(package)/usr/include
dh_install -s dh_install -s
# Must not depend on anything. This is to be called by # Must not depend on anything. This is to be called by
......
libs/dbus-c++/AUTHORS 0 → 100644
+ 1
− 0
View file @ e7a23822
Paolo Durante <shackan@gmail.com>
libs/dbus-c++/COPYING 0 → 100644
+ 504
− 0
View file @ e7a23822
This diff is collapsed.
libs/dbus-c++/ChangeLog 0 → 100644
+ 4
− 0
View file @ e7a23822
dbus-c++-1 (0.5.1-1) unstable; urgency=low
* Debian package (no warning version)
-- Yun Liu <yun.liu@savoirfairelinux.com> Mon, 01 Dec 2008 10:29:29 -0500
libs/dbus-c++/INSTALL 0 → 100644
+ 236
− 0
View file @ e7a23822
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:
/bin/bash ./configure CONFIG_SHELL=/bin/bash
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
libs/dbus-c++/Makefile.am 0 → 100644
+ 22
− 0
View file @ e7a23822
SUBDIRS = src tools data doc examples
EXTRA_DIST = autogen.sh libdbus-c++.spec libdbus-c++.spec.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dbus-c++-1.pc
MAINTAINERCLEANFILES = \
configure \
Makefile.in \
aclocal.m4 \
compile \
config.guess \
config.sub \
depcomp \
install-sh \
ltmain.sh \
mdate-sh \
missing \
mkinstalldirs \
libdbus-c++.spec
libs/dbus-c++/NEWS 0 → 100644
+ 0
− 0
View file @ e7a23822
libs/dbus-c++/README 0 → 100644
+ 0
− 0
View file @ e7a23822
libs/dbus-c++/SConscript 0 → 100644
+ 85
− 0
View file @ e7a23822
#
# library
#
env = WengoGetEnvironment()
env.ParseConfig('pkg-config --cflags --libs dbus-1')
libs = [
'expat'
]
lib_path = []
include_path = [
'include'
]
defines = {
'DBUS_API_SUBJECT_TO_CHANGE':1,
'DEBUG':1
}
headers = []
sources = [
'src/connection.cpp',
'src/debug.cpp',
'src/dispatcher.cpp',
'src/error.cpp',
'src/eventloop.cpp',
'src/interface.cpp',
'src/introspection.cpp',
'src/property.cpp',
'src/message.cpp',
'src/object.cpp',
'src/pendingcall.cpp',
'src/server.cpp',
'src/types.cpp',
'src/xml.cpp'
]
env.WengoAddDefines(defines)
env.WengoAddIncludePath(include_path)
env.WengoUseLibraries(libs)
env.WengoStaticLibrary('dbus-c++', sources)
#
# tools
#
tools_env = WengoGetEnvironment()
tools_libs = [
'dbus-c++'
]
tools_defines = {
'DBUS_API_SUBJECT_TO_CHANGE':1,
}
introspect_sources = [
'tools/introspect.cpp',
]
xml2cpp_sources = [
'tools/xml2cpp.cpp'
]
#tools_env.Append(LINKFLAGS = '-z origin')
#tools_env.Append(RPATH = env.Literal('\\$$ORIGIN\.'))
tools_env.WengoAddDefines(tools_defines)
tools_env.WengoAddIncludePath(include_path)
tools_env.WengoUseLibraries(tools_libs)
dbusxx_introspect = tools_env.WengoProgram('dbusxx-introspect', introspect_sources)
dbusxx_xml2cpp = tools_env.WengoProgram('dbusxx-xml2cpp', xml2cpp_sources)
#
# xml translator
#
def dbusxx_xml2cpp_emitter(target, source, env):
env.Depends(target, dbusxx_xml2cpp)
return (target, source)
dbusxx_xml2cpp_builder = Builder(action = dbusxx_xml2cpp[0].abspath + ' $SOURCE --adaptor=$TARGET',
emitter = dbusxx_xml2cpp_emitter,
suffix = '.h', src_suffix = '.xml')
Export('dbusxx_xml2cpp_builder')
libs/dbus-c++/TODO 0 → 100644
+ 8
− 0
View file @ e7a23822
* Implement asynchronous method calls (hint: start from DBus::PendingCall)
* ...and patch the codegen to generate stubs for them
* Implement continuations in a saner way
* Find time for some hardcore valgrinding
* Make DBus::Server free an incoming connection when it's disconnected, not when freeing the server
* More examples
* Inline (Doxygen-style) documentation
* Native protocol implementation (as an alternative to libdbus)
libs/dbus-c++/autogen.sh 0 → 100755
+ 18
− 0
View file @ e7a23822
#!/bin/bash
function autocmd()
{
echo "Running ${1}..."
$* || {
echo "Error running ${1}"
exit 1
}
}
autocmd libtoolize --force --copy
autocmd aclocal
autocmd autoheader
autocmd automake --add-missing --force-missing --copy -Wall
autocmd autoconf
echo "Autogen done, now you can ./configure"
libs/dbus-c++/config.guess 0 → 100755
+ 1526
− 0
View file @ e7a23822
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment