This actually touches upon several packages and issues that I think we
should at least try to resolve in debian before wheezy...
First, ccrtp and zrtp 2.0 or later require ucommon's commoncpp.
These are easy to build in Debian with ucommon commoncpp. However,
there are several packages that no doubt use zrtp and ccrtp. The one I
looked at was sflphone. I included the debian control file and a patch
I started on for supporting ucommon 5.2/ccrtp 2.x/zrtp 2.x. It doesn't
yet build correctly though, but is enough for Tristan to look at and see
how this would effect building sflphone...
I am pretty sure Werner Dittmann has been using twinkle with ccrtp 2.x
for awhile, and I hope could provide a patch for that as needed.
On 05/12/2012 06:03 PM, Jonas Smedegaard wrote:
> On 12-05-12 at 11:03pm, Jonas Smedegaard wrote:
>> On 12-05-12 at 04:06pm, David Sugar wrote:
>>> Well, what fails for me is ccrtp (and zrtpcpp) when I switched to
>>> the official debian repos for installing ucommon. But yes, not
>>> building commoncpp kills that too. I was also trying to do a build
>>> of sflphone with zrtp support.
>>
>> Hmm. Does it not work using official Debian packaged libucommon-dev
>> _and_ libcommoncpp2-dev
>>
>> If official libcommoncpp2-dev is too old, then please file a bugreport
>> about it. Or, if that exist already, perhaps post to that existing
>> one asking for status on progress - which has the nice side effect of
>> you getting "subscribed" to the bugreport and receiving notice when
>> progress do happen.
>
> Oh, well: I now realized that no files clashes with libcommoncpp2-dev
> so I've simply enabled building commoncpp now.
>
> Should be in Debian unstable within few hours.
>
>
> - Jonas
>
Index: sflphone-1.0.2/daemon/configure.ac
===================================================================
--- sflphone-1.0.2.orig/daemon/configure.ac 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/configure.ac 2012-05-14 12:06:25.443372090 -0400
@@ -137,20 +137,20 @@
LIBSAMPLERATE_MIN_VERSION=0.1.2
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION},, AC_MSG_ERROR([Missing libsamplerate development package: libsamplerate0-dev]))
-LIBCCGNU2_MIN_VERSION=1.3.1
-PKG_CHECK_MODULES(CCGNU2, libccgnu2 >= ${LIBCCGNU2_MIN_VERSION},, AC_MSG_ERROR([Missing common cpp development package: libcommoncpp2-dev]))
+LIBCCGNU2_MIN_VERSION=5.2.0
+PKG_CHECK_MODULES(CCGNU2, commoncpp >= ${LIBCCGNU2_MIN_VERSION},, AC_MSG_ERROR([Missing common cpp development package: libucommon-dev]))
-LIBCCEXT2_MIN_VERSION=1.3.1
-PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
+#LIBCCEXT2_MIN_VERSION=1.3.1
+#PKG_CHECK_MODULES(CCEXT2, libccext2 >= ${LIBCCEXT2_MIN_VERSION})
-LIBCCRT_MIN_VERSION=1.3.0
-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= ${LIBCCRT_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development package: libccrtp-dev]))
+LIBCCRT_MIN_VERSION=2.0.0
+PKG_CHECK_MODULES(CCRTP, libccrtp >= ${LIBCCRT_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development package: libccrtp-dev]))
dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support
PKG_CHECK_MODULES([libssl], libssl,, AC_MSG_ERROR([Missing ssl development package: libssl-dev]))
dnl Check for libzrtpcpp, a ccRTP extension providing zrtp key exchange
-LIBZRTPCPP_MIN_VERSION=1.3.0
+LIBZRTPCPP_MIN_VERSION=2.0.0
PKG_CHECK_MODULES(ZRTPCPP, libzrtpcpp >= ${LIBZRTPCPP_MIN_VERSION},, AC_MSG_ERROR([Missing zrtp development package: libzrtpcpp-dev]))
dnl DBus-C++ detection
@@ -160,7 +160,7 @@
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,,
AC_MSG_ERROR([You need the DBus-c++ libraries (version $DBUS_CPP_REQUIRED_VERSION or better)]))
-CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Weffc++ -Wfatal-errors"
+CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Weffc++"
AC_CHECK_LIB([expat], XML_ParserCreate_MM,
[AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false)],
Index: sflphone-1.0.2/daemon/src/audio/audiolayer.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/audiolayer.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/audiolayer.h 2012-05-14 12:06:25.443372090 -0400
@@ -34,7 +34,7 @@
#ifndef __AUDIO_LAYER_H__
#define __AUDIO_LAYER_H__
-#include <cc++/thread.h> // for ost::Mutex
+#include <commoncpp/thread.h> // for ost::Mutex
#include <sys/time.h>
#include "manager.h"
Index: sflphone-1.0.2/daemon/src/audio/audiorecorder.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/audiorecorder.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/audiorecorder.h 2012-05-14 12:06:25.443372090 -0400
@@ -32,7 +32,7 @@
#define __AUDIORECORDER_H_
#include <string>
-#include <cc++/thread.h>
+#include <commoncpp/thread.h>
#include "audiorecord.h"
#include "noncopyable.h"
Index: sflphone-1.0.2/daemon/src/audio/audiortp/audio_rtp_factory.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/audiortp/audio_rtp_factory.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/audiortp/audio_rtp_factory.h 2012-05-14 12:06:25.443372090 -0400
@@ -32,7 +32,7 @@
#define __AUDIO_RTP_FACTORY_H__
#include <stdexcept>
-#include <cc++/thread.h>
+#include <commoncpp/thread.h>
#include <ccrtp/CryptoContext.h>
#include "audio_rtp_session.h"
#include "noncopyable.h"
Index: sflphone-1.0.2/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h 2012-05-14 12:06:40.727484026 -0400
@@ -47,7 +47,7 @@
#pragma GCC diagnostic ignored "-Weffc++"
#include <ccrtp/rtp.h>
#include <ccrtp/iqueue.h>
-#include <cc++/numbers.h> // ost::Time
+#include <commoncpp/numbers.h> // ost::Time
class SIPCall;
Index: sflphone-1.0.2/daemon/src/audio/audiortp/audio_zrtp_session.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/audiortp/audio_zrtp_session.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/audiortp/audio_zrtp_session.h 2012-05-14 12:06:25.443372090 -0400
@@ -40,7 +40,7 @@
#include <libzrtpcpp/ZrtpUserCallback.h>
#include "audio_rtp_session.h"
-#include <cc++/numbers.h> // OST::Time
+#include <commoncpp/numbers.h> // OST::Time
class SIPCall;
Index: sflphone-1.0.2/daemon/src/audio/mainbuffer.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/audio/mainbuffer.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/audio/mainbuffer.h 2012-05-14 12:06:25.443372090 -0400
@@ -34,7 +34,7 @@
#include <map>
#include <set>
-#include <cc++/thread.h> // for ost::Mutex
+#include <commoncpp/thread.h> // for ost::Mutex
#include <string>
#include "global.h"
Index: sflphone-1.0.2/daemon/src/call.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/call.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/call.h 2012-05-14 12:06:25.443372090 -0400
@@ -32,7 +32,7 @@
#ifndef CALL_H
#define CALL_H
-#include <cc++/thread.h> // for mutex
+#include <commoncpp/thread.h> // for mutex
#include <sstream>
#include "audio/recordable.h"
Index: sflphone-1.0.2/daemon/src/codec.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/codec.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/codec.h 2012-05-14 12:06:25.447372132 -0400
@@ -30,7 +30,7 @@
#ifndef __SFL_CODEC_H__
#define __SFL_CODEC_H__
-#include <cc++/config.h> // for types
+#include <commoncpp/config.h> // for types
/**
* Interface for both audio codecs as well as video codecs.
Index: sflphone-1.0.2/daemon/src/eventthread.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/eventthread.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/eventthread.h 2012-05-14 12:06:25.447372132 -0400
@@ -31,7 +31,7 @@
#ifndef EVENT_THREAD_H_
#define EVENT_THREAD_H_
-#include <cc++/thread.h>
+#include <commoncpp/thread.h>
#include "noncopyable.h"
class VoIPLink;
Index: sflphone-1.0.2/daemon/src/main.cpp
===================================================================
--- sflphone-1.0.2.orig/daemon/src/main.cpp 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/main.cpp 2012-05-14 12:06:25.447372132 -0400
@@ -37,7 +37,7 @@
#include <string>
#include <dirent.h>
#include <sys/stat.h>
-#include <cc++/common.h>
+#include <commoncpp/commoncpp.h>
#include "global.h"
#include "fileutils.h"
Index: sflphone-1.0.2/daemon/src/managerimpl.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/managerimpl.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/managerimpl.h 2012-05-14 12:06:25.447372132 -0400
@@ -39,7 +39,7 @@
#include <vector>
#include <set>
#include <map>
-#include <cc++/thread.h>
+#include <commoncpp/thread.h>
#include "dbus/dbusmanager.h"
#include "config/config.h"
Index: sflphone-1.0.2/daemon/src/voiplink.h
===================================================================
--- sflphone-1.0.2.orig/daemon/src/voiplink.h 2012-05-14 12:01:51.000000000 -0400
+++ sflphone-1.0.2/daemon/src/voiplink.h 2012-05-14 12:06:25.447372132 -0400
@@ -36,7 +36,7 @@
#include <stdexcept>
#include <map>
-#include <cc++/thread.h> // for ost::Mutex
+#include <commoncpp/thread.h> // for ost::Mutex
class Call;
class Account;
Source: sflphone
Section: gnome
Priority: extra
Maintainer: Francois Marier <franc...@debian.org>
Build-Depends: debhelper (>= 7.0.50), autotools-dev, libnotify-dev (>= 0.7.0),
libpulse-dev, libsamplerate0-dev, libccrtp-dev, libcppunit-dev,
libgsm1-dev, libspeex-dev, libtool, libgtk-3-dev, libsexy-dev,
libasound2-dev, libspeexdsp-dev, libebook1.2-dev, uuid-dev,
liblog4c-dev, libcelt-dev, chrpath, libresample1-dev, libzrtpcpp-dev,
check, libsrtp0-dev, libssl-dev, libpcre3-dev, gnome-doc-utils,
libglib2.0-dev, libgnomeui-dev, rarian-compat, libwebkitgtk-3.0-dev,
libyaml-dev, astyle, libdbus-c++-dev
Standards-Version: 3.9.2
Homepage: http://www.sflphone.org
Vcs-Git: git://git.debian.org/git/collab-maint/sflphone.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/sflphone.git;a=summary
Package: sflphone-daemon
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: SIP and IAX2 compatible VoIP phone - core daemon
SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
goal is to create a robust enterprise-class desktop phone. While it can serve
home users very well, it is designed with a hundred-calls-a-day receptionist
in mind.
.
It features a flexible client/server architecture where the GTK+ client talks
to the daemon through DBus and is capable of handling multiple VoIP connections
at once.
.
This is the daemon package required by all SFLphone clients.
Package: sflphone-data
Architecture: all
Depends: ${misc:Depends}
Description: SIP and IAX2 compatible VoIP phone - common data
SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
goal is to create a robust enterprise-class desktop phone. While it can serve
home users very well, it is designed with a hundred-calls-a-day receptionist
in mind.
.
It features a flexible client/server architecture where the GTK+ client talks
to the daemon through DBus and is capable of handling multiple VoIP connections
at once.
.
This package includes the data files required by all SFLphone clients.
Package: sflphone-gnome
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, sflphone-daemon (=
${binary:Version}), sflphone-data (= ${source:Version}), librsvg2-common
Description: SIP and IAX2 compatible VoIP phone - GNOME client
SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
goal is to create a robust enterprise-class desktop phone. While it can serve
home users very well, it is designed with a hundred-calls-a-day receptionist
in mind.
.
It features a flexible client/server architecture where the GTK+ client talks
to the daemon through DBus and is capable of handling multiple VoIP connections
at once.
.
This is the graphical client for GNOME.
